Forum: Defining font in textarea and inputs

Without it font would depend on the client styling too much.

diff --git a/edumed/static/css/_mixins.scss b/edumed/static/css/_mixins.scss
new file mode 100644 (file)
index 0000000..6b9499c
--- /dev/null
+++ b/edumed/static/css/_mixins.scss
@@ -0,0 +1,7 @@
+@import "vars";
+
+@mixin base-font {
+    font-family: Dosis;
+    background: white;
+    color: $ciemny;
+}
\ No newline at end of file

diff --git a/edumed/static/css/_vars.scss b/edumed/static/css/_vars.scss
new file mode 100644 (file)
index 0000000..a502ca4
--- /dev/null
+++ b/edumed/static/css/_vars.scss
@@ -0,0 +1,4 @@
+$px: .0625em;
+$oranji: #ed7831;
+$ciemny: #363a3e;
+$zielony: #16a487;
\ No newline at end of file

diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css
index c59a82d..95fb533 100644 (file)
--- a/edumed/static/css/base.css
+++ b/edumed/static/css/base.css
@@ -9,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; }


@@ -22,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; }


@@ -44,7 +44,7 @@ header.main {
     list-style: none;
     display: inline-block;
     text-transform: uppercase;
     list-style: none;
     display: inline-block;
     text-transform: uppercase;

-    margin: 0 .5em;
+    margin: 0 0.5em;

     text-align: center;
     /*position:relative;*/ }
   header.main nav a {
     text-align: center;
     /*position:relative;*/ }
   header.main nav a {


@@ -203,5 +203,5 @@ footer.main {
     margin: 1em 0; }
 
 .flatpage img {
     margin: 1em 0; }
 
 .flatpage img {

-  border: 0.313em solid #eeeeee;
+  border: 0.3125em solid #eeeeee;

   margin: 1.3em; }
   margin: 1.3em; }

diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss
index c29938d..38f8a09 100644 (file)
--- a/edumed/static/css/base.scss
+++ b/edumed/static/css/base.scss
@@ -1,9 +1,7 @@
 @import url(http://fonts.googleapis.com/css?family=Dosis:400,700&subset=latin,latin-ext);
 
 @import url(http://fonts.googleapis.com/css?family=Dosis:400,700&subset=latin,latin-ext);
 

-$px: .0625em;
-$oranji: #ed7831;
-$ciemny: #363a3e;
-$zielony: #16a487;
+@import "vars";
+@import "mixins";

 
 
 a {
 
 
 a {


@@ -16,10 +14,8 @@ a {
 }
 
 body {
 }
 
 body {

-    font-family: Dosis;
+    @include base-font;

     margin: 0;
     margin: 0;

-    background: white;
-    color: $ciemny;

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

diff --git a/edumed/static/css/forum.css b/edumed/static/css/forum.css
index 2bc8c17..d788759 100644 (file)
--- a/edumed/static/css/forum.css
+++ b/edumed/static/css/forum.css
@@ -77,3 +77,8 @@ ul.breadcrumb {
     background: #ffcccc; }
   .forum-body .mini-pagination {
     padding: 3px 0 3px 10px; }
     background: #ffcccc; }
   .forum-body .mini-pagination {
     padding: 3px 0 3px 10px; }

+  .forum-body .post-form input, .forum-body .post-form textarea {
+    font-family: Dosis;
+    background: white;
+    color: #363a3e;
+    font-size: 1.6em; }

diff --git a/edumed/static/css/forum.scss b/edumed/static/css/forum.scss
index f937e4a..95eac73 100755 (executable)
--- a/edumed/static/css/forum.scss
+++ b/edumed/static/css/forum.scss
@@ -1,3 +1,6 @@
+@import "mixins";
+
+

 ul.breadcrumb {
     margin: 0;
     padding: 0;
 ul.breadcrumb {
     margin: 0;
     padding: 0;


@@ -154,4 +157,12 @@ ul.breadcrumb {
     .mini-pagination {
         padding: 3px 0 3px 10px;
     }
     .mini-pagination {
         padding: 3px 0 3px 10px;
     }

+
+
+    .post-form {
+        input, textarea {
+            @include base-font;
+            font-size: 1.6em;
+        }
+    }

 }
 }