Merging changes with dev

[github/wallabag/wallabag.git] / themes / baggy / css / main.css

diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index ce30cb5a8445da502a362d95802f11fbf06325ef..ce3148606dc894ae5acb6dd6c36fa3094fd7468b 100755 (executable)
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -92,7 +92,6 @@ form fieldset {
 form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] {
   border: 1px solid #999;
   padding: 0.5em 1em;
-  margin-left: 5px;
   min-width: 12em;
   color: #666;
 }
@@ -105,10 +104,6 @@ form input[type="text"], select, form input[type="password"], form input[type="u
   }
 }
 
-fieldset label {
-  min-width: 12.5em;
-}
-
 .inline .row {
   display: inline-block;
   margin-right: 0.5em;
@@ -120,10 +115,14 @@ fieldset label {
 
 fieldset label {
   display: inline-block;
-  margin-right: 0.5em;
+  min-width: 12.5em;
   color: #666;
 }
 
+label {
+  margin-right: 0.5em;
+}
+
 form .row {
   margin-bottom: 0.5em;
 }
@@ -541,7 +540,7 @@ footer a {
   2.1 = "save a link" related styles
   ========================================================================== */
 
-#bagit-form, #search-form {
+.popup-form {
   background: rgba(0,0,0,0.5);
   position: absolute;
   top: 0;
@@ -550,47 +549,54 @@ footer a {
   height: 100%;
   width: 100%;
   margin: 0;
-  margin-top: -30%;
+  margin-top: -30% !important; /* TODO: get rid of !important here; overridden by .messages selector */
   padding: 2em;
   display: none;
   border-left: 1px #EEE solid;
 }
 
-#bagit-form form, #search-form form {
-  background: #FFF;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 20;
-  border: 10px solid #000;
-  width: 400px;
-  height: 200px;
-  /* margin: -150px 0 0 -300px; */
-  padding: 2em;
-}
+       .popup-form form {
+               background: #FFF;
+               position: absolute;
+               top: 0;
+               left: 0;
+               z-index: 20;
+               border: 10px solid #000;
+               width: 400px;
+               height: 200px;
+               padding: 2em;
+       }
 
 #bagit-form-form .addurl {
        margin-left: 0;
 }
 
-.popup-close {
+.closeMessage,
+.close-button {
   background: #000;
   color: #FFF;
-       font-size: 1.4em;
-       line-height: 1.6em;
+       font-size: 1.2em;
+       line-height: 1.6;
        width: 1.6em;
        height: 1.6em;
        text-align: center;
   text-decoration: none;
+}
+       .closeMessage:hover,
+       .closeMessage:focus,
+       .close-button:hover,
+       .close-button:focus {
+               background: #999;
+               color: #000;
+       }
+
+.close-button--popup {
        display: inline-block;
        position: absolute;
        top: 0;
        right: 0;
+       font-size: 1.4em;
 }
-       .popup-close:hover {
-               background: #999;
-               color: #000;
-       }
 
 .active-current {
   background-color: #999;
@@ -643,42 +649,6 @@ a.add-to-wallabag-link-after:after {
   font-size: 0.9em;
 }
 
-/* ==========================================================================
-  2.2 = "search for articles" popup div related styles
-  ========================================================================== */
-#search-form {
-  background: rgba(0,0,0,0.5);
-  position: absolute;
-  top: 0;
-  left: 10em;
-  z-index: 20;
-  height: 100%;
-  width: 100%;
-  margin: 0;
-  margin-top: -30%;
-  padding: 2em;
-  display: none;
-  border-left: 1px #EEE solid;
-}
-
-#search-form form {
-  background: #FFF;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 20;
-  border: 10px solid #000;
-  width: 400px;
-  height: 200px;
-  /* margin: -150px 0 0 -300px; */
-  padding: 2em;
-}
-
-#submit-search{
-margin-left: 4em;
-margin-top:1em;
-}
-
 /* ==========================================================================
    3 = Pictos
    ========================================================================== */
@@ -788,18 +758,6 @@ margin-top:1em;
 
 .messages > * { display: inline-block;}
 
-.closeMessage {
-  background: #000;
-  color: #FFF;
-  padding: 0.2em 0.5em;
-  text-decoration: none;
-}
-
-  .closeMessage:hover, .closeMessage:focus {
-    background: #FFF;
-    color: #000;
-  }
-
 .warning {
   /* font-size: 3em;
   color: #999;
@@ -1058,8 +1016,16 @@ pre code {
     display: none;
   }
 
-  #bagit-form, #search-form {
+  .popup-form, #bagit-form, #search-form {
     left: 0;
+    width: 100%;
+    border-left: none;
+  }
+
+  .popup-form form,
+  #bagit-form form,
+  #search-form form {
+    width: 100%;
   }
 }