Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add bootstrap grid system in tools panel #931

Merged
merged 1 commit into from
Mar 30, 2016
Merged

Add bootstrap grid system in tools panel #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 29 additions & 20 deletions contribs/gmf/apps/desktop/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,28 +56,37 @@
</button>
<button ngeo-btn class="btn btn-default" ng-model="measureActive"
data-toggle="tooltip" data-placement="left" data-original-title="{{'Measure tools'|translate}}">
<span class="fa fa-circle">
<span class="fa fa-circle"></span>
</button>
</div>
<div class="tools-content" ng-class="{active: mainCtrl.toolsActive}">
<div ng-show="mainCtrl.loginActive">
<a class="btn close" ng-click="mainCtrl.loginActive = false">&times;</a>
<div class="tools-content-heading">
Login
</div>
<gmf-authentication></gmf-authentication>
<br>
</div>
<div ng-show="printActive">
<a class="btn close" ng-click="printActive = false">&times;</a>
<div class="tools-content-heading">
Print
</div>
</div>
<div ng-show="measureActive">
<a class="btn close" ng-click="measureActive = false">&times;</a>
<div class="tools-content-heading">
Measure
<div class="tools-content container-fluid" ng-class="{active: mainCtrl.toolsActive}">
<div class="row">
<div class="col-sm-12">
<div ng-show="mainCtrl.loginActive" class="row">
<div class="col-sm-12">
<div class="tools-content-heading">
Login
<a class="btn close" ng-click="mainCtrl.loginActive = false">&times;</a>
</div>
<gmf-authentication></gmf-authentication>
</div>
</div>
<div ng-show="printActive" class="row">
<div class="col-sm-12">
<div class="tools-content-heading">
Print
<a class="btn close" ng-click="printActive = false">&times;</a>
</div>
</div>
</div>
<div ng-show="measureActive" class="row">
<div class="col-sm-12">
<div class="tools-content-heading">
Measure
<a class="btn close" ng-click="measureActive = false">&times;</a>
</div>
</div>
</div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion contribs/gmf/less/desktop.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ gmf-layertree ul .treenode {
background-color: @brand-secondary;

.tools-content {
padding: @app-margin;
width: @right-panel-width;
margin-right: -@right-panel-width + @toolbar-width;
transition: margin-right 0.2s ease;
Expand All @@ -165,6 +164,7 @@ gmf-layertree ul .treenode {
color: @color;
padding-bottom: @app-margin;
margin-bottom: @app-margin;
margin-top: @grid-gutter-width / 2;
border-bottom: 1px solid @color;
}
}
Expand Down