Dev: fix some issue with bootsrap css on blobbueish

LimeSurvey · Apr 5, 2013 · 91cacd1 · 91cacd1
1 parent dc707c9
commit 91cacd1
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 28 deletions.
diff --git a/styles/adminstyle.css b/styles/adminstyle.css
@@ -1,6 +1,3 @@
-div.htmleditor {
-    display: inline-block;
-}
 /*** Minimized/Maximized Toolbar ***/
 
 .cke_minimized .cke_break,
@@ -37,6 +34,11 @@ div.htmleditor {
 	margin-top: 0.2em !important;
 }
 
+/* HTML editor */
+div.htmleditor {
+    display: inline-block;
+}
+
 .imagelink {
     float:left;
 }
@@ -68,7 +70,7 @@ div.htmleditor {
 /******************************************************************************/
 /* Bootstrap overrides.                                                       */
 /******************************************************************************/
-label {display: inline-block !important;}
+label {display: inline-block;}/* override but leave admin template to override again */
 .select{
     width: 250px;
     margin-left: 10px;
@@ -81,4 +83,4 @@ label {display: inline-block !important;}
 
 li input {
     margin: 0px;
-}
+}
diff --git a/styles/blobblueish/adminstyle.css b/styles/blobblueish/adminstyle.css
@@ -150,7 +150,7 @@ div.menubar .ui-widget-header
     vertical-align: middle;
     max-height:40px;
     border:0;
-    margin:0 -2px;
+    margin:0;
 }
 
 .menubar-title {
@@ -310,11 +310,14 @@ td {
     opacity:.50;
 }
 
-input, select, button {
-    color: navy;
-    font: 10px verdana, arial, sans-serif;
+select, textarea, 
+input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"]
+{
+    color:navy;
+}
+input, textarea { /* override bootstrap */
+    width: auto;
 }
-
 /* Uncomment these styles if you are using a system theme with a dark background
 and are having difficulty seeing text in inputs, textareas and dropdown selects. */
 /*
@@ -334,18 +337,9 @@ border: 1px solid #828790;
 */
 
 input[disabled], textarea[disabled], select[disabled], button[disabled] {
-    color: #999 !important;
-    background: #EEE !important;
-    border:1px solid #ccc !important;
-}
 
-textarea {
-    font-size: 10px;
-    color: navy;
-    font-family: verdana, arial, sans-serif;
 }
 
-
 .subtitle {
     font-size: 10px;
     color: #FFF;
@@ -1443,16 +1437,50 @@ div.right {
 
 .limebutton
 {
-    outline: 0;
-    margin:1px 4px 1px 0;
-    padding: 1px 1em;
-    text-decoration:none !important;
-    cursor:pointer;
-    font-size:0.9em;
-    text-align: center;
-    zoom: 1;
+  display: inline-block;
+  *display: inline;
+  padding: 4px 14px;
+  font-size: 14px;
+  line-height: 20px;
+  *line-height: 20px;
+  text-align: center;
+  vertical-align: middle;
+/*  font-weight:bold;*/
+  cursor: pointer;
+  border: 1px solid #bbbbbb;
+  *border: 0;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  *zoom: 1;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.limebutton
+{
+  border-color: #79B7E7;
+  border-color: rgba(121, 183, 231, 0.3) rgba(121, 183, 231, 0.3) rgba(121, 183, 231, 0.5);
+  color: #1D5987;
+  background-color: #dfeffc;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dfeffc), to(#c8e4fa));
+  background-image: -webkit-linear-gradient(top, #dfeffc, #c8e4fa);
+  background-image: -o-linear-gradient(top, #dfeffc, #c8e4fa);
+  background-image: linear-gradient(to bottom, #dfeffc, #c8e4fa);
+  background-image: -moz-linear-gradient(top, #dfeffc, #c8e4fa);
+  background-repeat: repeat-x;
+
+  border-color: #79B7E7 #79B7E7 #5f8eb3;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffdfeffc', endColorstr='#ffc8e4fa', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+.limebutton:focus,.limebutton:hover,.limebutton:active
+{
+  background-position:0 -15px;
+  color: #444;
+  background-color: #c8e4fa;
 }
-
 #emailtemplates .ui-tabs-panel .limebutton {
     margin: 3px 20% 10px 30.5%;
 }