Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #227 from warpc/193-new_design_for_wiki 

[refs #193] Fix wrap gollum and wiki page styles
This commit is contained in:
Vladimir Sharshov 2012-02-28 07:25:28 -08:00
parent e004822bd3 39b0beb3ab
commit 7a93239e35
2 changed files with 121 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/stylesheets/main.scss
View File

@ -27,15 +27,17 @@ a img { border: none; }
.wrap { .wrap {
width: 940px; width: 940px;
margin: 0 auto; margin: 0 auto;
text-align: center; // text-align: center;
border: 1px solid #3f668c; // border: 1px solid #3f668c;
-webkit-box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.5); // -webkit-box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.5); // -moz-box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.5);
box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.5); // box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.5);
background: #FFF; background: #FFF;
min-height: 92%; min-height: 92%;
} }
.hui {text-align: center;}
.wrap.columns { .wrap.columns {
background: #FFF image-url("page-bg.png") repeat-y; background: #FFF image-url("page-bg.png") repeat-y;
} }

228
vendor/assets/stylesheets/gollum/gollum.scss vendored
View File

@ -53,32 +53,32 @@
} }
/* @section content */ /* @section content */
#wiki-content { //#wiki-content {
height: 1%; // height: 1%;
overflow: visible; // overflow: visible;
} //}
//
#wiki-content .wrap { // #wiki-content .wrap {
height: 1%; // height: 1%;
overflow: auto; // overflow: auto;
} // }
//
/* @section comments */ // /* @section comments */
#wiki-body #inline-comment { // #wiki-body #inline-comment {
display: none; /* todo */ // display: none; /* todo */
} // }
//
/* @section body */ // /* @section body */
#wiki-body { // #wiki-body {
display: block; // display: block;
float: left; // float: left;
margin-right: 3%; // margin-right: 3%;
width: 100%; // width: 100%;
} // }
//
.has-rightbar #wiki-body { // .has-rightbar #wiki-body {
width: 68%; // width: 68%;
} // }
/* @section rightbar */ /* @section rightbar */
#wiki-rightbar { #wiki-rightbar {
@ -461,42 +461,42 @@
/* git_access */ /* git_access */
#wiki-content .url-box { //#wiki-content .url-box {
border: medium none; // border: medium none;
margin-left: 0; // margin-left: 0;
padding: 0; // padding: 0;
} //}
//
.url-box { //.url-box {
border-top: 1px solid #DDDDDD; // border-top: 1px solid #DDDDDD;
height: 23px; // height: 23px;
margin-left: -10px; // margin-left: -10px;
margin-top: 10px; // margin-top: 10px;
padding: 10px 10px 0; // padding: 10px 10px 0;
width: 100%; // width: 100%;
} //}
//
#wiki-content .url-box ul.clone_urls { //#wiki-content .url-box ul.clone_urls {
float: left; // float: left;
height: 23px; // height: 23px;
margin: 0; // margin: 0;
} //}
//
#wiki-content ul.clone-urls li.selected { //#wiki-content ul.clone-urls li.selected {
border-right-color: #BBBBBB; // border-right-color: #BBBBBB;
} //}
//
#wiki-content ul.clone-urls li { //#wiki-content ul.clone-urls li {
border: medium none; // border: medium none;
cursor: pointer; // cursor: pointer;
float: left; // float: left;
height: 23px; // height: 23px;
list-style-type: none; // list-style-type: none;
margin: 0; // margin: 0;
overflow: visible; // overflow: visible;
padding: 0; // padding: 0;
white-space: nowrap; // white-space: nowrap;
} //}
ul.clone-urls li { ul.clone-urls li {
list-style-type: none; list-style-type: none;
@ -512,58 +512,58 @@ ul.clone-urls li {
margin: 0 0 0 5px; margin: 0 0 0 5px;
} }
#wiki-content ul.clone-urls li.selected > a { //#wiki-content ul.clone-urls li.selected > a {
background: -moz-linear-gradient(center top , #D7D7D7, #ABABAB) repeat scroll 0 0 transparent; // background: -moz-linear-gradient(center top , #D7D7D7, #ABABAB) repeat scroll 0 0 transparent;
border-color: #C9C9C9 #C9C9C9 #9A9A9A; // border-color: #C9C9C9 #C9C9C9 #9A9A9A;
color: #000000; // color: #000000;
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.6); // text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.6);
} //}
//
#wiki-content ul.clone-urls li:first-child a { //#wiki-content ul.clone-urls li:first-child a {
border-bottom-left-radius: 3px; // border-bottom-left-radius: 3px;
border-left: 1px solid #D4D4D4; // border-left: 1px solid #D4D4D4;
border-top-left-radius: 3px; // border-top-left-radius: 3px;
} //}
//
#wiki-content ul.clone-urls li > a { //#wiki-content ul.clone-urls li > a {
-moz-border-bottom-colors: none; // -moz-border-bottom-colors: none;
-moz-border-image: none; // -moz-border-image: none;
-moz-border-left-colors: none; // -moz-border-left-colors: none;
-moz-border-right-colors: none; // -moz-border-right-colors: none;
-moz-border-top-colors: none; // -moz-border-top-colors: none;
background: -moz-linear-gradient(center top , #F4F4F4, #ECECEC) repeat scroll 0 0 transparent; // background: -moz-linear-gradient(center top , #F4F4F4, #ECECEC) repeat scroll 0 0 transparent;
border-color: #D4D4D4 #D4D4D4 #D4D4D4 -moz-use-text-color; // border-color: #D4D4D4 #D4D4D4 #D4D4D4 -moz-use-text-color;
border-style: solid solid solid none; // border-style: solid solid solid none;
border-width: 1px 1px 1px medium; // border-width: 1px 1px 1px medium;
color: #333333; // color: #333333;
display: block; // display: block;
font-size: 11px; // font-size: 11px;
font-weight: bold; // font-weight: bold;
height: 21px; // height: 21px;
line-height: 21px; // line-height: 21px;
margin: 0; // margin: 0;
padding: 0 9px; // padding: 0 9px;
text-decoration: none; // text-decoration: none;
text-shadow: 1px 1px 0 #FFFFFF; // text-shadow: 1px 1px 0 #FFFFFF;
} //}
//
#wiki-content input.url-field { //#wiki-content input.url-field {
-moz-border-bottom-colors: none; // -moz-border-bottom-colors: none;
-moz-border-image: none; // -moz-border-image: none;
-moz-border-left-colors: none; // -moz-border-left-colors: none;
-moz-border-right-colors: none; // -moz-border-right-colors: none;
-moz-border-top-colors: none; // -moz-border-top-colors: none;
border-color: #CCCCCC #CCCCCC #CCCCCC -moz-use-text-color; // border-color: #CCCCCC #CCCCCC #CCCCCC -moz-use-text-color;
border-style: solid solid solid none; // border-style: solid solid solid none;
border-width: 1px 1px 1px medium; // border-width: 1px 1px 1px medium;
color: #666666; // color: #666666;
float: left; // float: left;
font-family: Monaco, "Courier New", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace; // font-family: Monaco, "Courier New", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace;
font-size: 11px; // font-size: 11px;
height: 16px; // height: 16px;
padding: 3px 5px 2px; // padding: 3px 5px 2px;
width: 400px; // width: 400px;
} //}
/* @control syntax */ /* @control syntax */
.highlight { background: #ffffff; } .highlight { background: #ffffff; }