Reset top bar core styling

This commit is contained in:
Noel Wuyts 2015-05-28 17:13:21 +02:00 committed by Martin Schröder
parent d6275e2ffc
commit 927550ded0
4 changed files with 70 additions and 46 deletions

View file

@ -1,23 +1,22 @@
<div class="top-bar">
<div class="container">
<div class="row">
<div class="col-xs-1"></div>
<div class="col-xs-10">
<div class="outer-select">
<ui-select ng-model="selectedMode"
theme="bootstrap"
search-enabled="false"
on-select="onChangeMode($item, $model)"
class="inner-select" >
<ui-select-match placeholder="{{'Basic'|translate}}">{{$select.selected.label}}</ui-select-match>
<ui-select-choices repeat="mode in guiModes" refresh-delay="0">
<div>{{mode.label}}</div>
</ui-select-choices>
</ui-select>
</div>
<div class="box-model">{{ model }}</div>
</div>
<div class="col-xs-1"></div>
</div>
</div>
<div class="container">
<div class="row">
<div class="col-xs-5" style="font-size: 28px; padding-top: 10px;">{{ model }}</div>
<div style="float: right; margin-top: 10px; ">
<ui-select ng-model="selectedMode"
theme="bootstrap"
search-enabled="false"
on-select="onChangeMode($item, $model)"
style="width: 150px;"
>
<ui-select-match placeholder="{{'Basic'|translate}}">{{$select.selected.label}}</ui-select-match>
<ui-select-choices repeat="mode in guiModes"
refresh-delay="0">
<div >{{mode.label}}</div>
</ui-select-choices>
</ui-select>
</div>
</div>
</div>
</div>

View file

@ -232,3 +232,31 @@ h1, h2 {
color: #a8b400;
}
.top-bar .box-model {
font-size: 26px;
padding-top: 15px;
font-family: 'vodafont';
}
.top-bar .outer-select {
float: right;
padding-top: 10px;
}
.top-bar .inner-select {
width: 200px;
margin-top: 5px;
}
.top-bar .inner-select .btn {
font-size: 16px;
}
.top-bar .inner-select .dropdown-menu {
font-size: 16px;
}
.ui-select-bootstrap .ui-select-choices-row.active>a {
background-color: #777 !important;
}

View file

@ -5,7 +5,7 @@ angular.module("luci").config(function($provide){
"luciLayoutSingleColumnDirective": "/widgets/luci.layout.single_column.html",
"luciLayoutWithSidebarDirective": "/widgets/luci.layout.with_sidebar.html",
"luciNavbarDirective": "/widgets/luci.navbar.html",
//"luciTopBarDirective": "/widgets/luci.top_bar.html"
"luciTopBarDirective": "/widgets/luci.top_bar.html"
};
var plugin_root = "/themes/vodafone/";
Object.keys(overrides).map(function(k){

View file

@ -1,26 +1,23 @@
<div class="top-bar">
<div class="container">
<div class="row">
<div class="col-xs-1"></div>
<div class="col-xs-10">
<div style="float: right; margin-top: 10px; ">
<ui-select ng-model="selectedMode"
theme="bootstrap"
search-enabled="false"
on-select="onChangeMode($item, $model)"
style="width: 150px;"
>
<ui-select-match placeholder="{{'Basic'|translate}}">{{$select.selected.label}}</ui-select-match>
<ui-select-choices repeat="mode in guiModes"
refresh-delay="0">
<div >{{mode.label}}</div>
</ui-select-choices>
</ui-select>
</div>
<div style="font-size: 28px; padding-top: 10px; font-family: 'vodafont';">{{ model }}</div>
</div>
<div class="col-xs-1"></div>
</div>
</div>
<div class="container">
<div class="row">
<div class="col-xs-1"></div>
<div class="col-xs-10">
<div class="outer-select">
<ui-select ng-model="selectedMode"
theme="bootstrap"
search-enabled="false"
on-select="onChangeMode($item, $model)"
class="inner-select" >
<ui-select-match placeholder="{{'Basic'|translate}}">{{$select.selected.label}}</ui-select-match>
<ui-select-choices repeat="mode in guiModes" refresh-delay="0">
<div>{{mode.label}}</div>
</ui-select-choices>
</ui-select>
</div>
<div class="box-model">{{ model }}</div>
</div>
<div class="col-xs-1"></div>
</div>
</div>
</div>