Skip to content

Commit

Permalink
Avoid the use of \!important in CSS, introduce gmf-hidden in gmf exam…
Browse files Browse the repository at this point in the history
…ples
  • Loading branch information
adube committed Nov 6, 2018
1 parent 00d35cf commit 4fb8db7
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 25 deletions.
12 changes: 7 additions & 5 deletions contribs/gmf/examples/displayquerygrid.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport"
content="initial-scale=1.0, user-scalable=no, width=device-width">
<meta name="apple-mobile-web-app-capable" content="yes">
<link href="./hidelayertree.inc.css" rel="stylesheet" />
<link href="./gmf-hidden.inc.css" rel="stylesheet" />
</head>
<body ng-controller="MainController as ctrl">

Expand All @@ -29,10 +29,12 @@
</select>
</span>
</div>
<gmf-layertree
gmf-layertree-map="::ctrl.map"
gmf-layertree-openlinksinnewwindow="::true">
</gmf-layertree>
<div class="gmf-hidden">
<gmf-layertree
gmf-layertree-map="::ctrl.map"
gmf-layertree-openlinksinnewwindow="::true">
</gmf-layertree>
</div>
</div>

<div class="clear-left"></div>
Expand Down
12 changes: 7 additions & 5 deletions contribs/gmf/examples/displayquerywindow.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport"
content="initial-scale=1.0, user-scalable=no, width=device-width">
<meta name="apple-mobile-web-app-capable" content="yes">
<link href="./hidelayertree.inc.css" rel="stylesheet" />
<link href="./gmf-hidden.inc.css" rel="stylesheet" />
</head>
<body ng-controller="MainController as ctrl">

Expand All @@ -29,10 +29,12 @@
</select>
</span>
</div>
<gmf-layertree
gmf-layertree-map="::ctrl.map"
gmf-layertree-openlinksinnewwindow="::true">
</gmf-layertree>
<div class="gmf-hidden">
<gmf-layertree
gmf-layertree-map="::ctrl.map"
gmf-layertree-openlinksinnewwindow="::true">
</gmf-layertree>
</div>
</div>

<div class="clear-left"></div>
Expand Down
12 changes: 7 additions & 5 deletions contribs/gmf/examples/editfeatureselector.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport"
content="initial-scale=1.0, user-scalable=no, width=device-width">
<meta name="mobile-web-app-capable" content="yes">
<link href="./hidelayertree.inc.css" rel="stylesheet" />
<link href="./gmf-hidden.inc.css" rel="stylesheet" />
</head>
<body ng-controller="MainController as ctrl">
<gmf-map gmf-map-map="ctrl.map"></gmf-map>
Expand All @@ -22,10 +22,12 @@

<p><strong>Note:</strong> After logging it, you need to refresh the page</p>

<gmf-layertree
class="panel panel-default panel-body"
gmf-layertree-map="::ctrl.map">
</gmf-layertree>
<div class="gmf-hidden">
<gmf-layertree
class="panel panel-default panel-body"
gmf-layertree-map="::ctrl.map">
</gmf-layertree>
</div>

<gmf-authentication
class="panel panel-default panel-body">
Expand Down
3 changes: 3 additions & 0 deletions contribs/gmf/examples/gmf-hidden.inc.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.gmf-hidden {
display: none;
}
3 changes: 0 additions & 3 deletions contribs/gmf/examples/hidelayertree.inc.css

This file was deleted.

12 changes: 7 additions & 5 deletions contribs/gmf/examples/print.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport"
content="initial-scale=1.0, user-scalable=no, width=device-width">
<meta name="apple-mobile-web-app-capable" content="yes">
<link href="./hidelayertree.inc.css" rel="stylesheet" />
<link href="./gmf-hidden.inc.css" rel="stylesheet" />
</head>
<body ng-controller="MainController as ctrl">

Expand All @@ -21,10 +21,12 @@
</select>
</span>
</div>
<gmf-layertree
gmf-layertree-map="::ctrl.map"
gmf-layertree-openlinksinnewwindow="::true">
</gmf-layertree>
<div class="gmf-hidden">
<gmf-layertree
gmf-layertree-map="::ctrl.map"
gmf-layertree-openlinksinnewwindow="::true">
</gmf-layertree>
</div>
</div>

<div class="clear-left"></div>
Expand Down
11 changes: 9 additions & 2 deletions contribs/gmf/examples/search.css
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,15 @@ span.twitter-typeahead {
.gmf-search > * {
float: left;
}
gmf-search .gmf-search {
width: auto !important;
@media (max-width: 576px) {
.container-fluid gmf-search .gmf-search {
width: auto;
}
}
@media (min-width: 576px) {
.container-fluid gmf-search .gmf-search {
width: auto;
}
}
.gmf-search > .gmf-clear-button{
margin-left: -15px;
Expand Down

0 comments on commit 4fb8db7

Please sign in to comment.