Permalink
Browse files

Presentation fixes to formfactor and canvas

  • Loading branch information...
1 parent 38549d6 commit a6516782e09329e846e1bfc4a6ff18e3c5c41a06 Patrick Malley committed Apr 30, 2010
Showing with 201 additions and 22 deletions.
  1. +1 −1 theme/canvas/config.php
  2. +18 −18 theme/canvas/style/core.css
  3. +160 −0 theme/canvas/style/tabs.css
  4. +5 −3 theme/canvas/style/text.css
  5. +17 −0 theme/formfactor/style/core.css
View
@@ -19,7 +19,7 @@
// changes you want to your theme.
////////////////////////////////////////////////////
-$THEME->sheets = array('pagelayout', 'text', 'core', 'course', 'mods', 'blocks');
+$THEME->sheets = array('pagelayout', 'text', 'core', 'course', 'mods', 'blocks', 'tabs');
////////////////////////////////////////////////////
// Name of the stylesheet(s) you've including in
@@ -1,24 +1,24 @@
-.sitetopic { border:none; }
-
-.headingblock { border-bottom:1px solid #ddd;font-size:1.3em;color:#333; }
-
+.sitetopic { border: none; }
+.headingblock { border-bottom: 1px solid #ddd;font-size: 1.3em;color: #333; }
.singlebutton,
-.singleselect { text-align:center;margin:1em 0; }
+.singleselect { text-align: center;margin: 1em 0; }
-/* Login
--------------------------*/
-
-.loginbox {margin:15px 25%;}
+.loginbox { margin: 15px 25%; }
.loginbox .loginerrors { color: #f00; }
-.loginbox .loginform { margin: 15px auto 0;width:175px; }
-.loginbox .loginform .form-label {float:none;width:100%;margin:0 auto;text-align: left;}
-.loginbox .loginform .form-input {float: none;width:100%;margin: 0 auto;}
+.loginbox .loginform { margin: 15px auto 0;width: 175px; }
+.loginbox .loginform .form-label { float: none;width: 100%;margin: 0 auto;text-align: left; }
+.loginbox .loginform .form-input { float: none;width: 100%;margin: 0 auto; }
.loginbox .loginform .form-input #username,
-.loginbox .loginform .form-input #password { width:97%;padding: 3px;font-size: 1.1em;font-family: Helvetica, Arial, sans-serif;border: 2px solid #ddd;margin: 0 0 5px;color: #333; }
+.loginbox .loginform .form-input #password { width: 97%;padding: 3px;font-size: 1.1em;font-family: Helvetica, Arial, sans-serif;border: 2px solid #ddd;margin: 0 0 5px;color: #333; }
.loginbox .loginform .form-input #loginbtn { margin: 0.5em auto; }
-.loginbox .forgetpass { margin:1em 0 0;font-size: 0.95em;}
-.loginbox.twocolumns {width:90%;margin-left:5%;}
-.loginbox .guestsub {border-top:1px solid #DDDDDD;margin:5px 20%}
-.loginbox.twocolumns .loginpanel { border-color:#ddd;padding-right:0.5%; }
-.loginbox.twocolumns .signuppanel { padding-left:1%;width:49%; }
+.loginbox .forgetpass { margin: 1em 0 0;font-size: 0.95em; }
+.loginbox.twocolumns { width: 90%;margin-left: 5%; }
+.loginbox .guestsub { border-top: 1px solid #DDDDDD;margin: 5px 20% }
+.loginbox.twocolumns .loginpanel { border-color: #ddd;padding-right: 0.5%; }
+.loginbox.twocolumns .signuppanel { padding-left: 1%;width: 49%; }
+
+.userinfobox { border: none; }
+.userinfobox .content { border: 1px solid #ddd; }
+#page-user-view .buttons { text-align: center;width: 70%;margin: 0 auto; }
+#page-user-view .buttons div { padding: 0 0 10px; }
View
@@ -0,0 +1,160 @@
+.tabtree ul {
+ text-align: center;
+}
+
+.tabtree .tabrow0 {
+ width: 100%;
+ margin: 1em 0px;
+}
+
+.tabtree .tabrow0 li {
+ margin-right: -4px;
+}
+
+.tabtree .tabrow0 li.here {
+ font-weight: bold;
+}
+
+.tabtree .tabrow0 li.here a {
+ position: relative;
+ z-index: 102;
+}
+
+.tabtree .tabrow0 li a {
+ background:#f7f7f7;
+ padding: 8px 10px 5px;
+ border-width: 2px 2px 0;
+ border-style: solid;
+ border-color: #ddd;
+ margin:0 2px;
+}
+
+.tabtree .tabrow0 .here a {
+ background: #fff;
+}
+
+.tabtree .tabrow0 li a:hover {
+ background:#fff;
+}
+
+.tabtree .tabrow0 ul,
+.tabtree .tabrow0 div {
+ font-weight: normal;
+ border-top: 2px solid #ddd ;
+ padding: 0.25em 0px;
+ margin: 0px;
+}
+
+.tabtree .tabrow0 li.here .empty {
+ display: block;
+ height: 1px;
+ overflow: hidden;
+ padding: 0px;
+ position: absolute;
+ width: 100%;
+ bottom: -4px;
+}
+
+.tabtree .tabrow0 .tabrow1 {
+ padding:5px 0 2px;
+ margin-top: 1px;
+}
+.tabtree .tabrow1 li a,
+.tabtree .tabrow1 li a:hover,
+.tabtree .tabrow1 li a span,
+.tabtree .tabrow1 li a:hover span {
+ padding: 0 10px;
+ border: none;
+}
+
+.tabtree a.nolink,
+.tabtree .here ul a.nolink,
+.tabtree a.nolink:hover,
+.tabtree .here ul a.nolink:hover {
+ color: #888;
+ text-decoration: none;
+}
+
+.tabtree .here a.nolink,
+.tabtree .here ul .here a.nolink,
+.tabtree .here a.nolink:hover,
+.tabtree .here ul .here a.nolink:hover {
+ color: black;
+ text-decoration: none;
+}
+
+.ie7 .tabtree .tabrow0 li {
+ margin-left: 0;
+}
+
+.ie7 .tabtree .tabrow0 li.first {
+ margin-right: -4px;
+}
+
+.ie7 .tabtree .tabrow0 li.onerow {
+ margin-right: 0;
+}
+
+.ie7 .tabtree .tabrow0 a {
+ display: inline-block;
+ padding: 8px 0 0.35em 13px;
+ line-height: 1.5em;
+}
+
+.ie7 .tabtree .tabrow0 a span {
+ padding: 10px 1em 10px 0;
+}
+
+.ie7 .tabtree .tabrow0 div {
+ top: 2.6em;
+ padding: 0.2em 0;
+}
+
+.ie7 .tabtree .tabrow0 div.empty {
+ margin-right: 0;
+}
+
+.ie7.mod-quiz div.tabtree a span img.iconsmall {
+ margin: 0;
+ vertical-align: baseline;
+ position: relative;
+ top: 2px;
+}
+
+.ie6 .tabtree {
+ height: 100%;
+}
+
+.ie6 .tabtree .tabrow0 {
+ padding-top: 10px;
+}
+
+.ie6 .tabtree .tabrow0 li {
+ margin-left: 0;
+}
+
+.ie6 .tabtree .tabrow0 li.first {
+ margin-left: -4px;
+ margin-right: -4px;
+}
+
+.ie6 .tabtree .tabrow0 li.last a {
+ margin-right: 0;
+}
+
+.ie6 .tabtree .tabrow0 li.onerow {
+ margin-right: 0;
+}
+
+.ie6 .tabtree .tabrow0 a {
+ padding: 0 0 0 13px;
+}
+
+.ie6 .tabtree .tabrow0 a span {
+ padding: 12px 1em 4px 0;
+}
+
+.ie6 .tabtree .tabrow0 div {
+ top: 3.5em;
+ padding: 0.2em 0;
+}
@@ -7,11 +7,13 @@ body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { font-family: Helvetica, Arial
h1,h2,h3,h4,h5,h6 { font-weight: bold;margin:0; }
+h2.main,h3.main,h4.main { text-align: center; }
+
h1 { font-size: 2.25em; line-height: 1; margin-bottom: 0.5em; }
-h2 { font-size: 1.5em; margin-bottom: 0.25em; }
+h2 { font-size: 1.5em; margin-bottom: 0.5em; }
h3 { font-size: 1.25em; line-height: 1; margin-bottom: 0.5em; }
-h4 { font-size: 1.1em; line-height: 1.25; margin-bottom: 0.5em; }
-h5 { font-size: 1em; margin-bottom: 1.5em; }
+h4 { font-size: 1.1em; line-height: 1.25; margin-bottom: 0.75em; }
+h5 { font-size: 1em; margin-bottom: 1em; }
h6 { font-size: 1em; }
p { margin: 0 0 1em; }
@@ -30,6 +30,23 @@ body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { font-family: "Trebuchet MS",
#page-content-wrapper { margin:10px 50px; }
+/* Tabs
+---------------------------*/
+
+.tabtree .tabrow0 li.here a { background:#fff url([[pix:theme|gradient-sb]]) repeat-x 0 0; }
+.tabtree .tabrow0 .tabrow1 li a {background: none !important;}
+
+/* User
+---------------------------*/
+
+.userinfobox .content {border-width: 2px;background: url([[pix:theme|gradient-sb]]) repeat-x 0 0; }
+
+/* Forms
+------------------------*/
+
+.mform fieldset {border-color: #ddd;}
+.mform legend {border: 1px solid #ddd;padding: 2px 7px;background: url([[pix:theme|gradient-sb]]) repeat-x 0 -25%;}
+
/* Footer
--------------------------*/

0 comments on commit a651678

Please sign in to comment.