Commits

Torbjorn Tornkvist  committed bdcc524

Adding cantarell.css, trying out Google Font Dir.

  • Participants
  • Parent commits 4f37a01

Comments (0)

Files changed (5)

File src/redhot2_common.erl

     header(none).
 
 header(Selected) ->
-    lists:member(Selected,[home,twitter,login,logout,new,about]) andalso
+    lists:member(Selected,[home,twitter,projects,new,about]) andalso
         wf:wire(Selected, #add_class { class=selected }),
     #panel { body = [#image{image="/images/chili-small.png", 
                             class="chili_logo"},                     

File src/redhot2_web_projects.erl

     [#panel{body=[#link{class="theme", text="DigitalChili", 
                         postback={theme,"digitalchili"}, delegate=?MODULE },
                   " is the (new) default look of "++logo_text()]}
+
      , #panel{body=[#link{class="theme", text="WhiteChili", 
                           postback={theme,"whitechili"}, delegate=?MODULE },
                     " very similar to the default but more whiteish and it also "
                     "plays with the <b>@font-face</b> CSS directive."]}
+
+     , #panel{body=[#link{class="theme", text="Cantarell", 
+                          postback={theme,"cantarell"}, delegate=?MODULE },
+                    " very similar to the default but is using the "
+                    "<a href='http://code.google.com/webfonts/'>Google Font API</a> "
+                    "and a touch of <a href='http://gitready.com/'>GitReady</a>."
+                   ]}
     ].
      
 

File src/redhot2_web_theme.erl

     case wf:session(theme) of
         "digitalchili" -> "digitalchili.css";
         "whitechili"   -> "whitechili.css";
+        "cantarell"    -> "cantarell.css";
         _              -> "digitalchili.css"
     end.
 

File www/css/cantarell.css

+/* Trying out the Google Font API */
+@import url(http://fonts.googleapis.com/css?family=Cantarell:regular,italic,bold,bolditalic);
+
+html {
+    font-size:85%;
+}
+
+body {
+    background-color:#FFFEE6;
+    margin:0;
+    padding:0;
+    font-family: "Cantarell",Verdana,Arial,Helvetica,clean,sans-serif;
+    font-size:1em;
+    line-height:1.6em;
+    color:black;
+}
+
+
+em {font-family:"Cantarell",Verdana,Arial,Helvetica,clean,sans-serif;font-style:italic;}
+i {font-family:"Cantarell",Verdana,Arial,Helvetica,clean,sans-serif;font-style:italic;}
+b {font-family:"Cantarell",Verdana,Arial,Helvetica,clean,sans-serif;font-weight:bold;}
+
+.chili_logo {position:absolute; top:5px; left:-100px; z-index:10;}
+
+a img {border: none;}
+
+h1.header {
+// It is hard to choose a font....
+//    font-family:"Lucida Grande","Trebuchet MS",Verdana,sans-serif;
+//    font-family:"Consolas","Monaco","Courier New","Courier","monospace";
+      font-family:"Cantarell","Book Antiqua","Warnock Pro","Goudy Old Style","Palatino","Georgia","serif"; 
+//	font-family:Geneva, "Times New Roman", Times, serif;
+//	font-family: Verdana,Arial,Helvetica,sans-serif;
+//	font-family: Arial,Helvetica,sans-serif;
+//	font-weight:bold; 
+      font-weight: bold;
+      text-shadow: 3px 3px 3px #aaa;
+      letter-spacing:1px;
+}
+
+form {
+    border:0;
+    padding:0;
+    margin:0;
+}
+
+p,
+li,
+input,
+textarea,
+label,
+select {
+    font-size:1.1em;
+}
+
+.chilired {color:#d13430;}
+.big {font-size:120%;color:#d13430;}
+
+/*
+ * The page Intro text
+ */
+.intro {
+    margin:0 1.5em 1em -1.5em;
+    padding: 2px 0;
+    border-top:2px solid #cbd0c2;
+    border-bottom:2px solid #cbd0c2;
+    letter-spacing:1px;
+    font-family:"Cantarell", Geneva, Arial, Helvetica, sans-serif;
+    font-size:9px;
+    text-decoration:none;
+    color:black;
+    font-weight:bold;
+    font-style:italic;
+    font-size:120%;
+}
+
+/*
+ * The page menu
+ */
+.menu_box {
+    margin:-40px 0 40px 0;
+    padding:0;
+    list-style-type:none;
+    float:right;
+}
+.menu a  {
+    margin:0 0 0 0px;
+    padding:0px 4px;
+    float:left;
+    color: #222;
+    text-transform:uppercase;
+    letter-spacing:1px;
+    font-family:"Cantarell", Geneva, Arial, Helvetica, sans-serif;
+    font-weight: bold;
+    font-size:10px;
+    text-decoration:none;
+    display:block;
+}
+.menu a:hover {color:#FF80FF;}
+a.selected {color:#809FFF; background-color:#99FF80;}
+
+/*
+ * OpenID box
+ */
+.hide_openid_box {display:none; margin:25px 0px -25px 0px; padding-left:5px;}
+.show_openid_box {margin:25px 0px -25px 0px; padding-left:5px;}
+input.openid_login {
+   background: url(http://openid.net/login-bg.gif) no-repeat;
+   background-color: #fff;
+   background-position: 0 50%;
+   color: #000;
+   width:145px;
+   margin-right: 5px;
+   float: right;
+   padding-left: 18px;
+}
+
+
+/* 
+ * List entries
+ */
+.l_date {display:inline-block; color:#d13400; width: 7em; font-weight:normal;}
+.l_date_unpub {display:inline-block; color:blue; width: 7em; font-weight:normal;}
+a:hover.l_date_unpub{text-decoration:underline;}
+.l_author {display:inline-block;margin-left:1em; width: 4em; font-weight:normal;}
+.l_title {margin-left:2em; font-weight:bold; letter-spacing:1px;}
+a.l_title {text-decoration:none;}
+a:hover.l_title {text-decoration:underline;}
+.l_body {margin-left:3em; margin-top:1em;}
+
+/*
+ * Article entry
+ */
+.e_date {font-size:1em; color:#d13400; font-weight:bold;}
+.e_title {font-size:1em; margin-left:2em; font-weight:bold; letter-spacing:1px; color:black;}
+.e_author {float:left; font-size:0.9em; margin:4em 0 -4em -7em; padding-left:0; font-weight:normal;}
+
+/*
+ * Comments
+ */
+.e_comhdr{margin-left:1.5em; margin-bottom:1em;}
+.comhdr{margin-left:0.5em}
+.e_comform{display:none;margin:2em;}
+textarea.comment {height: 100px; width: 450px;}
+.c_date {font-size:0.9em; color:#d13430; font-weight:bold;}
+.c_who {font-size:0.9em; margin-left:2em; font-weight:bold; color:black;}
+.c_txt {
+    font-size:0.9em; 
+    margin-left:1em; 
+    margin:0.2em 0;
+    padding-left:0.6em; 
+    border-left:2px solid #cbd0c2;
+}
+.c_body {margin-left:2em; margin-top:0.6em;}
+.c_is_author {background-color:#e5ff87;}
+.c_is_author_txt {
+    background-color:#FF80FF;
+    font-size:0.9em; 
+    margin-left:1em; 
+    margin:0.2em 0;
+    padding-left:0.6em; 
+}
+.c_is_author:after {margin:0 0.5em 0 1em; content:"Author comment"; font-size:0.80em; text-transform:uppercase;}
+
+code {font-size: 110%;line-height:90%;}
+
+.by_who {color:black;}
+
+.footer {
+    clear:both;
+    float:left;
+    width:980px;
+    margin:4em 0 0 0;
+    padding:1em 0 4em 0;
+    border-top:2px solid #cbd0c2;
+    color:#91918d;
+    font-weight:normal;
+    font-size:70%;
+}
+
+
+/*
+ * Stuff on the projects page
+ */
+.icon_theme {margin:1em 0 0 -3em; width:10%;}
+.icon_twitter {margin:1em -1em 0 1em; width:10%;}
+.icon_sopcast {margin:1em -1em 0 1em; width:6%;}
+.proj_txt {margin-left:3em; width:65%;}
+.proj_themes {margin:0 0 1em 3em; width:65%;}
+.tw_search {padding:0.5em;}
+.sopcast_sport{padding-bottom: 1em; font-weight:bold; text-decoration:underline;}
+.sopcast_hdr {margin-left:2em; padding: 0.5em 0 0.5em 0; text-decoration:underline;}
+.sopcast_links {margin-left:4em;}
+
+
+/*
+ * The Markdown help
+ */
+.mdown_help {font-size:1.0em; display:none;}
+.mdown_help_link {font-size:0.9em; margin-top:-4px; margin-left:50%;}
+
+/*
+ * The New area.
+ */
+input.new {width: 550px;}
+textarea.new {height: 550px; width: 550px;}
+.button {margin-top: 5px;}
+

File www/css/whitechili.css

 /*
  * OpenID box
  */
-.openid_box {margin:25px 0px -25px 0px; padding-left:5px;}
+.hide_openid_box {display:none; margin:25px 0px -25px 0px; padding-left:5px;}
+.show_openid_box {margin:25px 0px -25px 0px; padding-left:5px;}
 input.openid_login {
    background: url(http://openid.net/login-bg.gif) no-repeat;
    background-color: #fff;