Skip to content

Commit

Permalink
Merge branch 'MDL-35231_M23' of git://github.com/lazydaisy/moodle int…
Browse files Browse the repository at this point in the history 
…o MOODLE_23_STABLE
  • Loading branch information
Aparup Banerjee committed Oct 10, 2012
2 parents 1778232 + 33b59af commit ca93b3a
Showing 1 changed file with 78 additions and 79 deletions.
157 changes: 78 additions & 79 deletions theme/serenity/style/core.css
View file
Expand Up @@ -16,34 +16,34 @@ html {
background: none; background: none;
} }


body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea {
font-family: Georgia, "Times New Roman", Times, serif; font-family: Georgia, "Times New Roman", Times, serif;
color: #2a2513; color: #2a2513;
} }


#wrapper { #wrapper {
background: #fff; background: #fff;
margin: 2% 5%; margin: 2% 5%;
padding: 5px; padding: 5px;
border: 1px solid #c1bc9d; border: 1px solid #c1bc9d;
} }


a { a {
color: #336699; color: #336699;
} }


a:hover { a:hover {
text-decoration: underline; text-decoration: underline;
} }


.pagelayout-frontpage #page-content #region-main-box #region-post-box { .pagelayout-frontpage #page-content #region-main-box #region-post-box {
padding-top: 0; padding-top: 0;
} }


/* Header /* Header
------------------------*/ ------------------------*/


#page-header { #page-header {
background: #ddd6cc url([[pix:theme|header_grass]]) repeat-x 0 100%; background: #ddd6cc url([[pix:theme|header_grass]]) repeat-x 0 100%;
margin-bottom: 5px; margin-bottom: 5px;
} }
Expand All @@ -52,7 +52,7 @@ a:hover {
margin-bottom: 0px; margin-bottom: 0px;
} }


.headermain { .headermain {
font-weight: normal; font-weight: normal;
margin: 1em 0.5em 0.75em; margin: 1em 0.5em 0.75em;
} }
Expand All @@ -67,57 +67,57 @@ a:hover {
float:none; float:none;
} }


/* Navbar /* Navbar
-------------------------*/ -------------------------*/


.navbar { .navbar {
background: #aeb9c6 url([[pix:theme|breadcrumb]]) repeat-x 0 100%; background: #aeb9c6 url([[pix:theme|breadcrumb]]) repeat-x 0 100%;
padding: 5px; padding: 5px;
} }


/* Blocks /* Blocks
-------------------------*/ -------------------------*/


.block { .block {
border-color: #eee; border-color: #eee;
} }


.block .header { .block .header {
background: #9eb1bf; background: #9eb1bf;
padding-left: 5px; padding-left: 5px;
} }


.block .title { .block .title {
background: #867f6a; background: #867f6a;
padding-left: 5px; padding-left: 5px;
} }


.block .title h2 { .block .title h2 {
background: #6e6855; background: #6e6855;
margin: 0; margin: 0;
padding: 5px; padding: 5px;
font-size: 1em; font-size: 1em;
color: #fff; color: #fff;
} }


.block_action { .block_action {
padding: 5px 0 0; padding: 5px 0 0;
} }


.block .content { .block .content {
background: #d8d2c6; background: #d8d2c6;
border: 1px solid #867f6a; border: 1px solid #867f6a;
} }


.block .minicalendar td, .block .minicalendar td,
.block .minicalendar th { .block .minicalendar th {
border-color: #d8d2c6; border-color: #d8d2c6;
} }


/* Course /* Course
----------------------------*/ ----------------------------*/


.headingblock { .headingblock {
background: url([[pix:theme|headingblock]]) repeat-x 0 0; background: url([[pix:theme|headingblock]]) repeat-x 0 0;
color: #fff; color: #fff;
font-weight: normal; font-weight: normal;
Expand All @@ -142,10 +142,10 @@ a:hover {
background: #fff; background: #fff;
} }


/* Forums /* Forums
-----------------------------*/ -----------------------------*/


.forumpost .topic { .forumpost .topic {
background: #cad5e1; background: #cad5e1;
border-width: 1px; border-width: 1px;
border-color: #eee #eee #aaa; border-color: #eee #eee #aaa;
Expand All @@ -158,11 +158,11 @@ a:hover {
} }




.forumpost .starter .subject { .forumpost .starter .subject {
font-weight: bold; font-weight: bold;
} }


.forumpost .content { .forumpost .content {
border-color: #eee; border-color: #eee;
border-width: 0 1px 1px; border-width: 0 1px 1px;
border-style: solid; border-style: solid;
Expand All @@ -172,56 +172,56 @@ a:hover {
/* Dock /* Dock
-----------------------------*/ -----------------------------*/


body.has_dock { body.has_dock {
margin: 0; margin: 0;
} }


#dock { #dock {
left: 5%; left: 5%;
margin-left: -29px; margin-left: -29px;
border-width: 0; border-width: 0;
background-color: transparent; background-color: transparent;
} }


#dock .controls { #dock .controls {
bottom: auto; bottom: auto;
background-color: #DDD6CC; background-color: #DDD6CC;
} }


#dock .dockeditem_container { #dock .dockeditem_container {
position: relative; position: relative;
} }


#dock .dockeditem.firstdockitem { #dock .dockeditem.firstdockitem {
margin-top: 50px; margin-top: 50px;
} }


#dock .dockeditem { #dock .dockeditem {
background-color: #fff; background-color: #fff;
padding: 2px; padding: 2px;
padding-right: 0px; padding-right: 0px;
} }


#dock .dockedtitle { #dock .dockedtitle {
border-width: 0; border-width: 0;
} }


#dock .dockedtitle h2 { #dock .dockedtitle h2 {
margin: 0; margin: 0;
padding: 10px 3px; padding: 10px 3px;
} }


#dock .dockedtitle.activeitem { #dock .dockedtitle.activeitem {
background-color: #817b65; background-color: #817b65;
width: 35px; width: 35px;
} }


#dockeditempanel { #dockeditempanel {
background-color: #817b65; background-color: #817b65;
margin-left: 5px; margin-left: 5px;
} }


#dockeditempanel .dockeditempanel_content { #dockeditempanel .dockeditempanel_content {
background-color: #eee9e0; background-color: #eee9e0;
margin: 0 3px; margin: 0 3px;
position: relative; position: relative;
Expand All @@ -230,78 +230,77 @@ body.has_dock {
border-color: #6f6856; border-color: #6f6856;
} }


#dockeditempanel .dockeditempanel_hd { #dockeditempanel .dockeditempanel_hd {
background-image: url([[pix:theme|headingblock]]); background-image: url([[pix:theme|headingblock]]);
border-width: 0; border-width: 0;
} }


#dockeditempanel .dockeditempanel_hd h2 { #dockeditempanel .dockeditempanel_hd h2 {
font-size: 1em; font-size: 1em;
color: #fff; color: #fff;
} }


/*cutom menu */ /*cutom menu */
/*YUI Reset */ /*YUI Reset */
.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-content, #custommenu .yui3-menu-horizontal .yui3-menu-content,
.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label, #custommenu .yui3-menu-horizontal .yui3-menu-label,
.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label-active, #custommenu .yui3-menu-horizontal .yui3-menu-label-active,
.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menuitem-active .yui3-menuitem-content, #custommenu .yui3-menu-horizontal .yui3-menuitem-active .yui3-menuitem-content,
.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label-menuvisible {background-position: -10000px -10000px;} #custommenu .yui3-menu-horizontal .yui3-menu-label-menuvisible {
.yui3-skin-sam #page .yui3-menu-label, background-position: -10000px -10000px;
.yui3-skin-sam #page .yui3-menu .yui3-menu .yui3-menu-label, }
.yui3-skin-sam #page .yui3-menubuttonnav .yui3-menu-label em {background-position: right center;} #custommenu .yui3-menu-label,
.yui3-skin-sam #page .yui3-splitbuttonnav .yui3-menu-label .yui3-menu-toggle {background-position: 3px center;} #custommenu .yui3-menu .yui3-menu .yui3-menu-label,
.yui3-skin-sam #page .yui3-splitbuttonnav .yui3-menu-label-menuvisible .yui3-menu-toggle {background-position: 0% 50%;} #custommenu .yui3-menubuttonnav .yui3-menu-label em {

background-position: right center;
}
#custommenu .yui3-splitbuttonnav .yui3-menu-label .yui3-menu-toggle {
background-position: 3px center;
}
#custommenu .yui3-splitbuttonnav .yui3-menu-label-menuvisible .yui3-menu-toggle {
background-position: 0% 50%;
}
#custommenu { #custommenu {
clear: both; clear: both;
background-image: url([[pix:theme|headingblock]]); background-image: url([[pix:theme|headingblock]]);
margin-bottom: 5px; margin-bottom: 5px;
} }

#custommenu .yui3-menu-label,
.yui3-skin-sam #page .yui3-menu-label, #custommenu .yui3-menuitem-content {
.yui3-skin-sam #page .yui3-menuitem-content {
color: #fff; color: #fff;
font-weight: 800; font-weight: 800;
line-height: 30px; line-height: 30px;
} }

#custommenu .custom_menu_submenu .yui3-menu-label,
.custom_menu_submenu .yui3-menu-label, #custommenu .custom_menu_submenu .yui3-menuitem-content {
.custom_menu_submenu .yui3-menuitem-content { color: #333;
color: #000 !important; text-shadow: none;
text-shadow: none !important;
line-height: 25px; line-height: 25px;
} }

#custommenu .yui3-menu-label.yui3-menu-label-active,
.yui3-skin-sam #page .yui3-menu-label.yui3-menu-label-active, #custommenu .yui3-menu-label.yui3-menu-label-menuvisible,
.yui3-skin-sam #page .yui3-menu-label.yui3-menu-label-menuvisible, #custommenu .yui3-menuitem-active .yui3-menuitem-content {
.yui3-skin-sam #page .yui3-menuitem-active .yui3-menuitem-content {
color: #000; color: #000;
background-color: #d8d2c6; background-color: #d8d2c6;
} }

#custommenu .yui3-menu-content,
.yui3-skin-sam #page .yui3-menu-content, #custommenu .yui3-menu-content,
.yui3-skin-sam #page .yui3-menu-content, #custommenu .yui3-menu .yui3-menu .yui3-menu-content,
.yui3-skin-sam #page .yui3-menu .yui3-menu .yui3-menu-content, #custommenu .yui3-menu-horizontal .yui3-menu-label,
.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label, #custommenu .yui3-menu-horizontal .yui3-menuitem-content {
.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menuitem-content { border: 0 none;
border: none !important;
} }

#custommenu .yui3-menu-horizontal .yui3-menu-label,
.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label, #custommenu .yui3-menu-horizontal .yui3-menuitem-content {
.yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-content { border: 0 none;
border-color:#808080;
border-style:solid;
border-width:0px 0;
} }

#custommenu .custom_menu_submenu {
#page .custom_menu_submenu { border: 2px solid #d8d2c6;
border: 2px solid #d8d2c6 !important;
background: #fff; background: #fff;
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
-webkit-box-shadow: 0px 1px 3px #ccc; -webkit-box-shadow: 0px 1px 3px #ccc;
-moz-box-shadow: 0px 1px 3px #ccc; -moz-box-shadow: 0px 1px 3px #ccc;
box-shadow: 0px 1px 3px #ccc; box-shadow: 0px 1px 3px #ccc;
} }

0 comments on commit ca93b3a

Please sign in to comment.