Remove control-menu from lexicon

liferay · Aug 25, 2015 · 385293c · 385293c
1 parent 40c9932
commit 385293c
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 169 deletions.
diff --git a/src/content/control_menu.html b/src/content/control_menu.html
@@ -13,15 +13,14 @@
 			<div class="control-menu-level-2">
 				<div class="container-fluid-1280">
 					<ul class="control-menu-nav">
-						<li>
+						<li class="control-menu-nav-item">
 							<a class="control-menu-icon sidenav-toggler" href="javascript:;">
 								<span class="icon-fb-radio icon-monospaced"></span>
 								<span class="control-menu-icon-label">Staging</span>
 							</a>
 						</li>
 
-
-						<li class="active">
+						<li class="active control-menu-nav-item">
 							<span class="">
 								<a href="javascript:;" class="control-menu-icon taglib-icon">
 									<i class="icon-circle-blank icon-monospaced"></i>
@@ -30,7 +29,8 @@
 								</a>
 							</span>
 						</li>
-						<li>
+
+						<li class="control-menu-nav-item">
 							<label>Site Pages Variation</label>
 							<select class="form-control input-sm">
 								<option>Summer 2015</option>
@@ -39,7 +39,8 @@
 								<option>Fall 2014</option>
 							</select>
 						</li>
-						<li>
+
+						<li class="control-menu-nav-item">
 							<label>Pages Variation</label>
 							<select class="form-control input-sm">
 								<option>v3.5F June</option>
@@ -48,7 +49,8 @@
 								<option>v1.4 December</option>
 							</select>
 						</li>
-						<li>
+
+						<li class="control-menu-nav-item">
 							<div class="checkbox checkbox-default">
 								<label>
 									<input type="checkbox" value="">
@@ -57,7 +59,7 @@
 							</div>
 						</li>
 
-						<li>
+						<li class="control-menu-nav-item">
 							<button class="btn btn-default btn-sm">Publish to Live</button>
 						</li>
 					</ul>
@@ -67,39 +69,40 @@
 			<div class="control-menu-level-1">
 				<div class="container-fluid-1280">
 					<ul class="control-menu-nav">
-						<li>
+						<li class="control-menu-nav-item">
 							<a class="control-menu-icon sidenav-toggler" href="javascript:;">
 								<span class="icon-align-justify icon-monospaced"></span>
 							</a>
 						</li>
 
-
-						<li class="active">
+						<li class="active control-menu-nav-item">
 							<span class="">
 								<a href="javascript:;" class="control-menu-icon taglib-icon">
 									<i class="icon-plus icon-monospaced"></i>
 									<span class="taglib-text hide-accessible"></span>
 								</a>
 							</span>
 						</li>
-						<li>
+
+						<li class="control-menu-nav-item">
 							<span class="">
 								<a href="#1" class="control-menu-icon taglib-icon">
 									<i class="icon-cog icon-monospaced"></i>
 									<span class="taglib-text hide-accessible"></span>
 								</a>
 							</span>
 						</li>
-						<li>
+
+						<li class="control-menu-nav-item">
 							<span class="toggle-controls">
 								<a href="javascript:;" class="control-menu-icon taglib-icon">
 									<i class="controls-state-icon icon-eye-open icon-monospaced"></i>
 									<span class="taglib-text hide-accessible"></span>
 								</a>
 							</span>
 						</li>
-						<li>
 
+						<li class="control-menu-nav-item">
 							<div class="dropdown" style="display: inline-block;">
 								<a aria-expanded="false" class="control-menu-icon dropdown-toggle taglib-icon" data-toggle="dropdown" href="javascript:;">
 									<i class="controls-state-icon icon-info icon-monospaced"></i>
@@ -113,10 +116,9 @@
 									<li><a href="#">Scope</a></li>
 								</ul>
 							</div>
-
 						</li>
 
-						<li>
+						<li class="control-menu-nav-item">
 							<span class="">
 								<a href="javascript:;" class="control-menu-icon taglib-icon">
 									<i class="icon-desktop icon-monospaced"></i>

diff --git a/src/scss/atlas-theme/_atlas.scss b/src/scss/atlas-theme/_atlas.scss
@@ -4,7 +4,6 @@
 @import "buttons";
 @import "button-groups";
 @import "cards";
-@import "control-menu";
 @import "dropdowns";
 @import "figures";
 @import "forms";

diff --git a/src/scss/atlas-theme/_control-menu.scss b/src/scss/atlas-theme/_control-menu.scss
diff --git a/src/scss/atlas-theme/_variables.scss b/src/scss/atlas-theme/_variables.scss
@@ -5,7 +5,6 @@
 @import "variables/breadcrumbs";
 @import "variables/buttons";
 @import "variables/cards";
-@import "variables/control-menu";
 @import "variables/dropdowns";
 @import "variables/figures";
 @import "variables/forms";

diff --git a/src/scss/atlas-theme/variables/_control-menu.scss b/src/scss/atlas-theme/variables/_control-menu.scss
diff --git a/src/scss/lexicon-base/_control-menu.scss b/src/scss/lexicon-base/_control-menu.scss
diff --git a/src/scss/lexicon-base/_lexicon.scss b/src/scss/lexicon-base/_lexicon.scss
@@ -4,7 +4,6 @@
 @import "breadcrumbs";
 @import "buttons";
 @import "cards";
-@import "control-menu";
 @import "crop-image";
 @import "dropdowns";
 @import "equal-height-columns";

diff --git a/src/scss/lexicon-base/_variables.scss b/src/scss/lexicon-base/_variables.scss
@@ -1,6 +1,5 @@
 @import "variables/badges";
 @import "variables/cards";
-@import "variables/control-menu";
 @import "variables/figures";
 @import "variables/icons";
 @import "variables/labels";

diff --git a/src/scss/lexicon-base/variables/_control-menu.scss b/src/scss/lexicon-base/variables/_control-menu.scss