Skip to content
Browse files

Merge branch 'dash30/master'

* dash30/master:
  Moved inline css from _header.tpl to standalone stylesheet
  • Loading branch information...
2 parents 7f6122b + c666627 commit 2c9f74b8afb01429f4aee161807b5fab59896d57 @ginatrapani ginatrapani committed
Showing with 180 additions and 189 deletions.
  1. +179 −0 webapp/cssjs/style.css
  2. +1 −189 webapp/templates/_header.tpl
View
179 webapp/cssjs/style.css
@@ -0,0 +1,179 @@
+html {
+ background: #eeeeea;
+ font: small Candara, "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+a, a:link, a:visited {
+ text-decoration: none;
+ color: #0060e0;
+}
+
+a:hover {
+ text-decoration : underline;
+ color : red;
+}
+
+a:visited {
+ color : black;
+ text-decoration: underline;
+}
+
+h1 {
+ font-size : x-large;
+ //display : none;
+}
+
+h2 {
+ padding-bottom : 20px;
+ font-size : smaller;
+}
+
+.section h2 {
+ //display : none;
+}
+
+h3 {
+ font-weight : 800;
+}
+
+li {
+ padding-bottom : 10px;
+ line-height : 125%;
+}
+
+#hd, #ft {
+ padding : 20px 20px 20px 0px;
+}
+
+#keystats {
+ padding : 5px;
+ font-size : medium;
+}
+
+#yui-main .yui-g {
+ margin-left : 50px;
+ width : 600px;
+}
+
+.success {
+ background-color:#BFDFBF;
+ padding:10px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
+
+.info {
+ background-color:#FFFFAD;
+ padding:10px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
+
+ /******* MENU *******/
+ #top #menu {
+ margin:5px;
+ padding:5px;
+ width : 100%;
+ font-size : smaller;
+}
+ #top #menu li {
+ padding: 8px;
+ margin:10px;
+ display : inline;
+}
+ #top #menu li:hover{
+ color: #0060e0;
+ cursor: pointer;
+ }
+
+ .submenu {
+ padding-left : 20px;
+ padding-top : 10px;
+ font-size : small;
+ }
+
+ #sidemenu {
+ display : none;
+ }
+
+ /******* /MENU *******/
+ /******* LOADING *******/
+ #loading, #loading_mentions, #loading_followers, #loading_friends, #loading_links {
+ visibility: hidden;
+ float : left;
+ }
+ /******* /LOADING *******/
+
+
+ /******* Tweet Formatting ********/
+
+ .individual-tweet {
+ padding : 10px;
+ margin-top : 10px;
+ clear : left;
+ }
+
+ .individual-tweet p {
+ font-size : smaller;
+ }
+
+ .reply {
+ padding-left : 85px;
+ }
+
+ .private {
+ border : 1px dotted #666;
+ background-color : #eee;
+ }
+
+ .person-info {
+ float: left;
+ margin-right: 10px;
+ width : 80px;
+ text-align : center;
+ }
+
+ li.individual-tweet h3 a {
+ font-size : x-small;
+ color : #666;
+ }
+
+ li.individual-tweet h4, li.individual-tweet form {
+ font-size : xx-small;
+ visibility:hidden;
+ }
+
+ li.individual-tweet h4.reply-count {
+ font-size : medium;
+ visibility:visible;
+ }
+
+ li.individual-tweet:hover h4, li.individual-tweet:hover form {
+ visibility: visible;
+ color : #666;
+ }
+
+
+ li.individual-tweet:hover h3 a {
+ color: #0060e0;
+ }
+
+li.individual-tweet h3 a.most-popular {
+ font-size : medium;
+ font-weight : strong;
+ }
+
+ .avatar {
+ border: solid 1px #ccc;
+ }
+
+.error {
+ background-color:#FF8080;
+ padding:10px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ color:white;
+ text-align:center;
+ font-weight:bold;
+}
+ /******* /Tweet Formatting ********/
View
190 webapp/templates/_header.tpl
@@ -8,197 +8,9 @@
<link rel="stylesheet" href="http://yui.yahooapis.com/2.7.0/build/reset-fonts-grids/reset-fonts-grids.css" type="text/css">
<link type="text/css" href="{$cfg->site_root_path}cssjs/jquery-ui-1.7.1.custom.css" rel="stylesheet" />
<link rel="shortcut icon" href="{$cfg->site_root_path}favicon.ico"/>
-{literal}
- <style type="text/css">
-
- html {
- background: #eeeeea;
- font: small Candara, "Helvetica Neue", Helvetica, Arial, sans-serif;
- }
-
- a, a:link, a:visited {
- text-decoration: none;
- color: #0060e0;
- }
-
- a:hover {
- text-decoration : underline;
- color : red;
- }
-
- a:visited {
- color : black;
- text-decoration: underline;
- }
-
- h1 {
- font-size : x-large;
- //display : none;
- }
-
- h2 {
- padding-bottom : 20px;
- font-size : smaller;
- }
-
- .section h2 {
- //display : none;
- }
-
- h3 {
- font-weight : 800;
- }
-
- li {
- padding-bottom : 10px;
- line-height : 125%;
- }
-
- #hd, #ft {
- padding : 20px 20px 20px 0px;
- }
-
- #keystats {
- padding : 5px;
- font-size : medium;
- }
-
- #yui-main .yui-g {
- margin-left : 50px;
- width : 600px;
- }
-
- .success {
- background-color:#BFDFBF;
- padding:10px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
-
- .info {
- background-color:#FFFFAD;
- padding:10px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
-
- /******* MENU *******/
- #top #menu {
- margin:5px;
- padding:5px;
- width : 100%;
- font-size : smaller;
- }
- #top #menu li {
- padding: 8px;
- margin:10px;
- display : inline;
- }
- #top #menu li:hover{
- color: #0060e0;
- cursor: pointer;
- }
-
- .submenu {
- padding-left : 20px;
- padding-top : 10px;
- font-size : small;
- }
-
- #sidemenu {
- display : none;
- }
-
- /******* /MENU *******/
- /******* LOADING *******/
- #loading, #loading_mentions, #loading_followers, #loading_friends, #loading_links {
- visibility: hidden;
- float : left;
- }
- /******* /LOADING *******/
-
-
- /******* Tweet Formatting ********/
-
- .individual-tweet {
- padding : 10px;
- margin-top : 10px;
- clear : left;
- }
-
- .individual-tweet p {
- font-size : smaller;
- }
-
- .reply {
- padding-left : 85px;
- }
-
- .private {
- border : 1px dotted #666;
- background-color : #eee;
- }
-
- .person-info {
- float: left;
- margin-right: 10px;
- width : 80px;
- text-align : center;
- }
-
- li.individual-tweet h3 a {
- font-size : x-small;
- color : #666;
- }
-
- li.individual-tweet h4, li.individual-tweet form {
- font-size : xx-small;
- visibility:hidden;
- }
-
- li.individual-tweet h4.reply-count {
- font-size : medium;
- visibility:visible;
- }
-
- li.individual-tweet:hover h4, li.individual-tweet:hover form {
- visibility: visible;
- color : #666;
- }
-
-
- li.individual-tweet:hover h3 a {
- color: #0060e0;
- }
-
- li.individual-tweet h3 a.most-popular {
- font-size : medium;
- font-weight : strong;
- }
-
- .avatar {
- border: solid 1px #ccc;
- }
-
- .error {
- background-color:#FF8080;
- padding:10px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- color:white;
- text-align:center;
- font-weight:bold;
- }
- /******* /Tweet Formatting ********/
-
-
- </style>
- {/literal}
+ <link type="text/css" href="{$cfg->site_root_path}cssjs/style.css" rel="stylesheet" />
<script type="text/javascript" charset="utf-8" src="http://bit.ly/javascript-api.js?version=latest&login={$cfg->bitly_login}&apiKey={$cfg->bitly_api_key}"></script>
-
-
-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.1/jquery-ui.min.js"></script>

0 comments on commit 2c9f74b

Please sign in to comment.
Something went wrong with that request. Please try again.