Merge remote-tracking branch 'origin/filmowa' into filmowa

[edumed.git] / edumed / static / css / base.css

diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css
index e29f770..f718c23 100644 (file)
--- a/edumed/static/css/base.css
+++ b/edumed/static/css/base.css
@@ -1,4 +1,5 @@
-@import url(http://fonts.googleapis.com/css?family=Dosis:400,700&subset=latin,latin-ext);
+@charset "UTF-8";
+@import url(//fonts.googleapis.com/css?family=Dosis:400,700&subset=latin,latin-ext);

 a {
   text-decoration: none;
   color: #ed7831; }
 a {
   text-decoration: none;
   color: #ed7831; }


@@ -8,9 +9,9 @@ a {
 
 body {
   font-family: Dosis;
 
 body {
   font-family: Dosis;

-  margin: 0;

   background: white;
   background: white;

-  color: #363a3e; }
+  color: #363a3e;
+  margin: 0; }

 
 .clr {
   clear: both; }
 
 .clr {
   clear: both; }


@@ -21,9 +22,9 @@ body {
   background-position: 0 100%; }
 
 header.main {
   background-position: 0 100%; }
 
 header.main {

-  margin: 0 auto 1.438em;
+  margin: 0 auto 1.4375em;

   width: 58.75em;
   width: 58.75em;

-  padding: 1.813em 0.625em 0; }
+  padding: 1.8125em 0.625em 0; }

   header.main #logo {
     float: left;
     margin-bottom: 1.25em; }
   header.main #logo {
     float: left;
     margin-bottom: 1.25em; }


@@ -31,7 +32,10 @@ header.main {
       vertical-align: middle; }
   header.main #organizer {
     float: right;
       vertical-align: middle; }
   header.main #organizer {
     float: right;

-    margin-top: 1.3em; }
+    font-size: .75em;
+    color: #777; }
+    header.main #organizer img {
+      margin-top: .5em; }

   header.main nav ul {
     padding: 0;
     position: absolute;
   header.main nav ul {
     padding: 0;
     position: absolute;


@@ -44,43 +48,63 @@ header.main {
     text-align: center;
     /*position:relative;*/ }
   header.main nav a {
     text-align: center;
     /*position:relative;*/ }
   header.main nav a {

-    color: #ed7831;
+    color: #363a3e;

     display: block;
     vertical-align: bottom;
     font-size: .85em; }
   header.main nav a:hover {
     display: block;
     vertical-align: bottom;
     font-size: .85em; }
   header.main nav a:hover {

-    color: #363a3e; }
+    color: #ed7831; }

   header.main nav a:before {
   header.main nav a:before {

+    content: " ";

     display: block;
     display: block;

+    margin-bottom: .8em;
+    width: 2.75em;
+    height: 2.125em;
+    text-align: center;
+    margin: auto;

     margin-bottom: .8em; }
   header.main nav .menu-lekcje:before {
     margin-bottom: .8em; }
   header.main nav .menu-lekcje:before {

-    content: url(../img/menu/lekcje.png); }
+    background: url(../img/menu/lekcje.png) no-repeat 0 0;
+    background-size: 100%; }

   header.main nav .menu-kompetencje:before {
   header.main nav .menu-kompetencje:before {

-    content: url(../img/menu/katalog.png); }
+    background: url(../img/menu/katalog.png) no-repeat 0 0;
+    background-size: 100%; }

   header.main nav .menu-wspolpraca:before {
   header.main nav .menu-wspolpraca:before {

-    content: url(../img/menu/wspolpraca.png); }
+    background: url(../img/menu/wspolpraca.png) no-repeat 0 0;
+    background-size: 100%; }

   header.main nav .menu-szkolenia:before {
   header.main nav .menu-szkolenia:before {

-    content: url(../img/menu/szkolenia.png); }
+    background: url(../img/menu/szkolenia.png) no-repeat 0 0;
+    background-size: 100%; }

   header.main nav .menu-wesprzyj:before {
   header.main nav .menu-wesprzyj:before {

-    content: url(../img/menu/wesprzyj.png); }
+    background: url(../img/menu/wesprzyj.png) no-repeat 0 0;
+    background-size: 100%; }

   header.main nav .menu-o-nas:before {
   header.main nav .menu-o-nas:before {

-    content: url(../img/menu/o-nas.png); }
+    background: url(../img/menu/o-nas.png) no-repeat 0 0;
+    background-size: 100%; }

   header.main nav .menu-kontakt:before {
   header.main nav .menu-kontakt:before {

-    content: url(../img/menu/kontakt.png); }
+    background: url(../img/menu/kontakt.png) no-repeat 0 0;
+    background-size: 100%; }

   header.main nav .menu-lekcje:hover:before {
   header.main nav .menu-lekcje:hover:before {

-    content: url(../img/menu/lekcje_active.png); }
+    background: url(../img/menu/lekcje_active.png) no-repeat 0 0;
+    background-size: 100%; }

   header.main nav .menu-kompetencje:hover:before {
   header.main nav .menu-kompetencje:hover:before {

-    content: url(../img/menu/katalog_active.png); }
+    background: url(../img/menu/katalog_active.png) no-repeat 0 0;
+    background-size: 100%; }

   header.main nav .menu-wspolpraca:hover:before {
   header.main nav .menu-wspolpraca:hover:before {

-    content: url(../img/menu/wspolpraca_active.png); }
+    background: url(../img/menu/wspolpraca_active.png) no-repeat 0 0;
+    background-size: 100%; }

   header.main nav .menu-szkolenia:hover:before {
   header.main nav .menu-szkolenia:hover:before {

-    content: url(../img/menu/szkolenia_active.png); }
+    background: url(../img/menu/szkolenia_active.png) no-repeat 0 0;
+    background-size: 100%; }

   header.main nav .menu-wesprzyj:hover:before {
   header.main nav .menu-wesprzyj:hover:before {

-    content: url(../img/menu/wesprzyj_active.png); }
+    background: url(../img/menu/wesprzyj_active.png) no-repeat 0 0;
+    background-size: 100%; }

   header.main nav .menu-o-nas:hover:before {
   header.main nav .menu-o-nas:hover:before {

-    content: url(../img/menu/o-nas_active.png); }
+    background: url(../img/menu/o-nas_active.png) no-repeat 0 0;
+    background-size: 100%; }

   header.main nav .menu-kontakt:hover:before {
   header.main nav .menu-kontakt:hover:before {

-    content: url(../img/menu/kontakt_active.png); }
+    background: url(../img/menu/kontakt_active.png) no-repeat 0 0;
+    background-size: 100%; }

   header.main #tagline {
     clear: both;
     float: left;
   header.main #tagline {
     clear: both;
     float: left;


@@ -92,10 +116,9 @@ header.main {
     color: #363a3e; }
   header.main #search {
     float: right;
     color: #363a3e; }
   header.main #search {
     float: right;

-    padding: 0 0.625em;

     background-color: white;
     /* Extend padded background .*/
     background-color: white;
     /* Extend padded background .*/

-    padding: 0 0.625em;
+    padding: 2px 0.625em 0;

     margin-right: -0.625em; }
 
 #content {
     margin-right: -0.625em; }
 
 #content {


@@ -109,17 +132,76 @@ footer.main {
   border-top: 1px solid #c9ccce;
   width: 58.75em;
   padding: 0.2em 0.625em;
   border-top: 1px solid #c9ccce;
   width: 58.75em;
   padding: 0.2em 0.625em;

-  margin: 2.5em auto 0 auto;
+  margin: 2.5em auto 1em auto;

   color: #9a9c9e; }
   color: #9a9c9e; }

+  footer.main p {
+    font-size: .75em; }

   footer.main .footer-item {
     float: left;
     margin-right: 1.25em;
     width: 13.75em; }
   footer.main .footer-item {
     float: left;
     margin-right: 1.25em;
     width: 13.75em; }

-    footer.main .footer-item p {
-      font-size: .75em; }
-  footer.main .footer-item-half {
+  footer.main .sponsors-column {

     float: left;
     float: left;

-    margin-right: 1.25em;
+    margin-left: 1.25em;

     width: 6.25em; }
     width: 6.25em; }

-    footer.main .footer-item-half p {
+    footer.main .sponsors-column p {

       font-size: .75em; }
       font-size: .75em; }

+  footer.main .footer-extra p {
+    margin-top: 0; }
+
+#search {
+  font-size: .8em; }
+  #search input, #search button {
+    font-family: Dosis;
+    font-size: .9em;
+    vertical-align: bottom;
+    border: 1px solid #c9ccce;
+    padding: 0;
+    margin: 0;
+    line-height: .9em; }
+  #search input {
+    border-right-width: 0;
+    height: 16px;
+    width: 16em;
+    padding-left: 1.3em; }
+  #search button {
+    height: 18px;
+    width: 1.8em; }
+    #search button span {
+      position: relative;
+      top: -1px; }
+  #search input::-webkit-input-placeholder {
+    text-transform: uppercase; }
+  #search input:-moz-placeholder {
+    text-transform: uppercase; }
+  #search input::-moz-placeholder {
+    text-transform: uppercase; }
+  #search input::-ms-placeholder {
+    text-transform: uppercase; }
+
+.link-list {
+  list-style: none;
+  padding: 0; }
+  .link-list li {
+    margin-bottom: .5em; }
+  .link-list a:before {
+    content: "→";
+    margin-right: .5em; }
+  .link-list a {
+    color: #363a3e; }
+  .link-list a:hover {
+    color: #ed7831; }
+
+.link-list-colored a {
+  color: #ed7831; }
+
+.plain {
+  margin: 0;
+  padding: 0;
+  list-style: none; }
+  .plain li {
+    margin: 1em 0; }
+
+.flatpage img {
+  border: 0.3125em solid #eeeeee;
+  margin: 1.3em; }