fix#75 buttons size

geosolutions-it · Aug 12, 2016 · 4a1c217 · 4a1c217
1 parent 18aa4a6
commit 4a1c217
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 19 deletions.
diff --git a/samples/base/buttons.html b/samples/base/buttons.html
@@ -9,6 +9,7 @@
     <meta name="description" content="">
     <meta name="author" content="Chef Studio">
     <link rel="icon" href="../../favicon.ico">
+    <link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
 
     <title>Buttons MapStore2</title>
 
@@ -549,10 +550,30 @@ <h1>Btn with Shadow</h1>
     		<div class="glyphicon glyphicon-off"></div>
      	</button>
 
+         <div class="page-header">
+        <h1>Check</h1>
+      </div>
+
+     <button type="button" class="btn btn-danger square-button-md ">
+    		<div class="glyphicon glyphicon-remove-sign"></div>
+     </button>
+
+     <button type="button" class="btn btn-success square-button-md ">
+    		<div class="glyphicon glyphicon-ok-sign"></div>
+     </button>
+
+
+	<div class="glyphicon glyphicon-remove-sign green check"></div>
+
+	<div class="glyphicon glyphicon-ok-sign red check"></div>
+
+
+
 	  <div class="page-header">
         <h1>Buttons</h1>
       </div>
       <p>
+      btn-lg<br/>
         <button type="button" class="btn btn-lg btn-default">Default</button>
         <button type="button" class="btn btn-lg btn-primary">Primary</button>
         <button type="button" class="btn btn-lg btn-success">Success</button>
@@ -562,15 +583,27 @@ <h1>Buttons</h1>
         <button type="button" class="btn btn-lg btn-link">Link</button>
       </p>
       <p>
+      btn-md<br/>
         <button type="button" class="btn btn-md btn-default">Default</button>
         <button type="button" class="btn btn-md btn-primary">Primary</button>
         <button type="button" class="btn btn-md btn-success">Success</button>
         <button type="button" class="btn btn-md btn-info">Info</button>
         <button type="button" class="btn btn-md btn-warning">Warning</button>
         <button type="button" class="btn btn-md btn-danger">Danger</button>
         <button type="button" class="btn btn-md btn-link">Link</button>
+      </p>
+       <p>
+       btn<br/>
+        <button type="button" class="btn  btn-default">Default</button>
+        <button type="button" class="btn  btn-primary">Primary</button>
+        <button type="button" class="btn  btn-success">Success</button>
+        <button type="button" class="btn  btn-info">Info</button>
+        <button type="button" class="btn  btn-warning">Warning</button>
+        <button type="button" class="btn  btn-danger">Danger</button>
+        <button type="button" class="btn  btn-link">Link</button>
       </p>
       <p>
+      btn-sm<br/>
         <button type="button" class="btn btn-sm btn-default">Default</button>
         <button type="button" class="btn btn-sm btn-primary">Primary</button>
         <button type="button" class="btn btn-sm btn-success">Success</button>
@@ -580,6 +613,7 @@ <h1>Buttons</h1>
         <button type="button" class="btn btn-sm btn-link">Link</button>
       </p>
       <p>
+      btn-xs<br/>
         <button type="button" class="btn btn-xs btn-default">Default</button>
         <button type="button" class="btn btn-xs btn-primary">Primary</button>
         <button type="button" class="btn btn-xs btn-success">Success</button>
@@ -589,10 +623,13 @@ <h1>Buttons</h1>
         <button type="button" class="btn btn-xs btn-link">Link</button>
       </p>
 
+
+
       <div class="page-header">
         <h1>Buttons with Icons</h1>
       </div>
       <p>
+       btn-lg<br/>
         <button type="button" class="btn btn-lg btn-default"><div class="glyphicon glyphicon-search float-left"></div> Default</button>
         <button type="button" class="btn btn-lg btn-primary"><div class="glyphicon glyphicon-circle-arrow-up float-left"></div>Primary</button>
         <button type="button" class="btn btn-lg btn-success"><div class="glyphicon glyphicon-cloud float-left"></div>Success</button>
@@ -602,6 +639,7 @@ <h1>Buttons with Icons</h1>
         <button type="button" class="btn btn-lg btn-link"><div class="glyphicon glyphicon-filter float-left"></div>Link</button>
       </p>
       <p>
+       btn-md<br/>
         <button type="button" class="btn btn-md btn-default"><div class="glyphicon glyphicon-search float-left"></div> Default</button>
         <button type="button" class="btn btn-md btn-primary"><div class="glyphicon glyphicon-circle-arrow-up float-left"></div>Primary</button>
         <button type="button" class="btn btn-md btn-success"><div class="glyphicon glyphicon-cloud float-left"></div>Success</button>
@@ -610,7 +648,20 @@ <h1>Buttons with Icons</h1>
         <button type="button" class="btn btn-md btn-danger"><div class="glyphicon glyphicon-camera float-left"></div>Danger</button>
         <button type="button" class="btn btn-md btn-link"><div class="glyphicon glyphicon-filter float-left"></div>Link</button>
       </p>
+
+       <p>
+       btn<br/>
+        <button type="button" class="btn  btn-default"><div class="glyphicon glyphicon-search float-left"></div> Default</button>
+        <button type="button" class="btn  btn-primary"><div class="glyphicon glyphicon-circle-arrow-up float-left"></div>Primary</button>
+        <button type="button" class="btn  btn-success"><div class="glyphicon glyphicon-cloud float-left"></div>Success</button>
+        <button type="button" class="btn  btn-info"><div class="glyphicon glyphicon-envelope float-left"></div>Info</button>
+        <button type="button" class="btn  btn-warning"><div class="glyphicon glyphicon-adjust float-left"></div>Warning</button>
+        <button type="button" class="btn  btn-danger"><div class="glyphicon glyphicon-camera float-left"></div>Danger</button>
+        <button type="button" class="btn  btn-link"><div class="glyphicon glyphicon-filter float-left"></div>Link</button>
+      </p>
+
       <p>
+       btn-sm<br/>
        <button type="button" class="btn btn-sm btn-default"><div class="glyphicon glyphicon-search float-left"></div> Default</button>
         <button type="button" class="btn btn-sm btn-primary"><div class="glyphicon glyphicon-circle-arrow-up float-left"></div>Primary</button>
         <button type="button" class="btn btn-sm btn-success"><div class="glyphicon glyphicon-cloud float-left"></div>Success</button>
@@ -620,6 +671,7 @@ <h1>Buttons with Icons</h1>
         <button type="button" class="btn btn-sm btn-link"><div class="glyphicon glyphicon-filter float-left"></div>Link</button>
       </p>
       <p>
+       btn-xs<br/>
         <button type="button" class="btn btn-xs btn-default"><div class="glyphicon glyphicon-search float-left"></div> Default</button>
         <button type="button" class="btn btn-xs btn-primary"><div class="glyphicon glyphicon-circle-arrow-up float-left"></div>Primary</button>
         <button type="button" class="btn btn-xs btn-success"><div class="glyphicon glyphicon-cloud float-left"></div>Success</button>

diff --git a/samples/base/custom.html b/samples/base/custom.html
@@ -9,6 +9,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="../../favicon.ico">
+    <link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
 
     <title>THEME MAP STORE 2</title>
 
@@ -78,10 +79,11 @@ <h1>THEME MAP STORE 2</h1>
       </div>
 
 
-      <div class="page-header">
+       <div class="page-header">
         <h1>Buttons</h1>
       </div>
       <p>
+      btn-lg<br/>
         <button type="button" class="btn btn-lg btn-default">Default</button>
         <button type="button" class="btn btn-lg btn-primary">Primary</button>
         <button type="button" class="btn btn-lg btn-success">Success</button>
@@ -91,15 +93,27 @@ <h1>Buttons</h1>
         <button type="button" class="btn btn-lg btn-link">Link</button>
       </p>
       <p>
+      btn-md<br/>
         <button type="button" class="btn btn-md btn-default">Default</button>
         <button type="button" class="btn btn-md btn-primary">Primary</button>
         <button type="button" class="btn btn-md btn-success">Success</button>
         <button type="button" class="btn btn-md btn-info">Info</button>
         <button type="button" class="btn btn-md btn-warning">Warning</button>
         <button type="button" class="btn btn-md btn-danger">Danger</button>
         <button type="button" class="btn btn-md btn-link">Link</button>
+      </p>
+       <p>
+       btn<br/>
+        <button type="button" class="btn  btn-default">Default</button>
+        <button type="button" class="btn  btn-primary">Primary</button>
+        <button type="button" class="btn  btn-success">Success</button>
+        <button type="button" class="btn  btn-info">Info</button>
+        <button type="button" class="btn  btn-warning">Warning</button>
+        <button type="button" class="btn  btn-danger">Danger</button>
+        <button type="button" class="btn  btn-link">Link</button>
       </p>
       <p>
+      btn-sm<br/>
         <button type="button" class="btn btn-sm btn-default">Default</button>
         <button type="button" class="btn btn-sm btn-primary">Primary</button>
         <button type="button" class="btn btn-sm btn-success">Success</button>
@@ -109,6 +123,7 @@ <h1>Buttons</h1>
         <button type="button" class="btn btn-sm btn-link">Link</button>
       </p>
       <p>
+      btn-xs<br/>
         <button type="button" class="btn btn-xs btn-default">Default</button>
         <button type="button" class="btn btn-xs btn-primary">Primary</button>
         <button type="button" class="btn btn-xs btn-success">Success</button>
@@ -117,6 +132,8 @@ <h1>Buttons</h1>
         <button type="button" class="btn btn-xs btn-danger">Danger</button>
         <button type="button" class="btn btn-xs btn-link">Link</button>
       </p>
+
+
 
 
       <div class="page-header">

diff --git a/samples/map/home.html b/samples/map/home.html
@@ -111,7 +111,7 @@
 
     					<div class="divider-edit float-left"></div>
 
-    					<button type="button" class="btn btn-primary square-button-md float-left">
+    					<button type="button" class="btn btn-danger square-button-md float-left">
     					<div class="glyphicon glyphicon-remove-circle"></div>
      					</button>
 
@@ -142,7 +142,7 @@
 
     					<div class="divider-edit float-left"></div>
 
-    					<button type="button" class="btn btn-primary square-button-md float-left">
+    					<button type="button" class="btn btn-danger square-button-md float-left">
     					<div class="glyphicon glyphicon-remove-circle"></div>
      					</button>
 
@@ -173,7 +173,7 @@
 
     					<div class="divider-edit float-left"></div>
 
-    					<button type="button" class="btn btn-primary square-button-md float-left">
+    					<button type="button" class="btn btn-danger square-button-md float-left">
     					<div class="glyphicon glyphicon-remove-circle"></div>
      					</button>
 
@@ -204,7 +204,7 @@
 
     					<div class="divider-edit float-left"></div>
 
-    					<button type="button" class="btn btn-primary square-button-md float-left">
+    					<button type="button" class="btn btn-danger square-button-md float-left">
     					<div class="glyphicon glyphicon-remove-circle"></div>
      					</button>
 
@@ -235,7 +235,7 @@
 
     					<div class="divider-edit float-left"></div>
 
-    					<button type="button" class="btn btn-primary square-button-md float-left">
+    					<button type="button" class="btn btn-danger square-button-md float-left">
     					<div class="glyphicon glyphicon-remove-circle"></div>
      					</button>
 
@@ -266,7 +266,7 @@
 
     					<div class="divider-edit float-left"></div>
 
-    					<button type="button" class="btn btn-primary square-button-md float-left">
+    					<button type="button" class="btn btn-danger square-button-md float-left">
     					<div class="glyphicon glyphicon-remove-circle"></div>
      					</button>
 

diff --git a/theme/default/css/css.css b/theme/default/css/css.css
@@ -2004,8 +2004,8 @@ select[multiple].input-lg {
   cursor: pointer;
   background-image: none;
   white-space: nowrap;
-  padding: 0 12px;
-  font-size: 28px;
+  padding: 6px 12px;
+  font-size: 16px;
   line-height: 1.428571429;
   border-radius: 0;
   -webkit-user-select: none;
@@ -2051,7 +2051,6 @@ fieldset[disabled] .btn {
 
 .btn-default {
   color: #078aa3;
-  font-size:28px;
   background-color:#ffffff;
   border:#078aa3 1px solid;
 }
@@ -2094,7 +2093,6 @@ fieldset[disabled] .btn-default.active {
   color: #ffffff;
   background-color: #078aa3;
   border:none;
-  font-size: 28px;
 }
 
 .btn-primary:hover {
@@ -2334,12 +2332,13 @@ fieldset[disabled] .btn-link:focus {
 .btn-group-lg > .btn {
   line-height: 1.33;
   border-radius: 0;
+  font-size:24px;
 }
 
 .btn-md,
 .btn-group-md > .btn {
-  padding: 5px 5px;
-  font-size: 22px;
+  padding: 6px 12px;
+  font-size: 20px;
   line-height: 1.33;
 
 }

diff --git a/theme/default/css/custom.css b/theme/default/css/custom.css
@@ -101,24 +101,30 @@ a:hover, a:active, a:link, a:focus  {
 }
 
 /* btn with icon */
+.btn .glyphicon{
+	margin-right:6px;
+	margin-top:0px;
+	font-size:20px;
+}
+
 .btn-lg .glyphicon{
-	margin-right:5px;
-	margin-top:5px;
+	margin-top:2px;
+	font-size:28px;
 }
 
 .btn-md .glyphicon{
-	margin-right:5px;
-	margin-top:3px;
+	margin-top:2px;
+	font-size:26px;
 }
 
 .btn-sm .glyphicon{
-	margin-right:5px;
 	margin-top:1px;
 	font-size:18px;
 }
 
 .btn-xs .glyphicon{
 	margin-right:5px;
+	margin-top:-1px;
 	font-size:18px;
 }
 
@@ -442,12 +448,14 @@ a:hover, a:active, a:link, a:focus  {
 }
 
 .square-button .glyphicon {
-    margin-left: -5px;
+    margin-left: -6px;
+	margin-top:3px;
 	font-size: 35px;
 }
 
 .square-button-md .glyphicon {
     margin-left: -9px;
+	margin-top:-2px;
 	font-size: 23px;
 }
 
@@ -1123,6 +1131,10 @@ input[type=radio]:checked+.lbl::before {
 	font-size:32px;
 }
 
+.check{
+	font-size:30px;
+}
+
 .green{
 	color:#4E8C75;
 }