diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 5425f1826..723b93bd6 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -37,7 +37,7 @@ div.position-f{ } div.position-f p.font{ - font-family: 微软雅黑; + font-family: "Microsoft YaHei"; font-weight: bold; font-size: 16px; color: #15bccf; @@ -57,7 +57,7 @@ div.position-s p.font{ div.position-t{ padding-top: 13px; float: left; - width: width: 238px; + width: 238px; line-height: 0.5em; } @@ -83,7 +83,7 @@ div.sidebar-user{ border: 1px solid #e5dfc7; float: left; display: block; - height:80px; + height:80px; width: 80px; } @@ -100,7 +100,7 @@ div.sidebar-user{ div.sidebar-f div.name{ float: left; padding-left: 8px; - font-family:微软雅黑; + font-family:"Microsoft YaHei"; font-weight:bold; font-size:16px; color:#4d4d4d; @@ -228,7 +228,7 @@ div.forums-info{ } div.forums-title{ - font-family: 微软雅黑; + font-family: "Microsoft YaHei"; font-weight: bold; font-size: 16px; color: rgb(237, 137, 36); @@ -251,7 +251,7 @@ span.forums-avatar-right{ } .formus-first-title{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight:bold; padding-top:3px; padding-bottom:3px; @@ -262,7 +262,7 @@ span.forums-avatar-right{ width: 290px; white-space: nowrap; overflow: hidden; - -o-text-overflow: ellisis; + -o-text-overflow: ellipsis; text-overflow: ellipsis; } .contextual-borad{ @@ -374,7 +374,7 @@ span.forums-avatar-right{ width: 430px; white-space: nowrap; overflow: hidden; - -o-text-overflow: ellisis; + -o-text-overflow: ellipsis; text-overflow: ellipsis; } @@ -382,7 +382,7 @@ span.forums-avatar-right{ width: 650px; white-space: nowrap; overflow: hidden; - -o-text-overflow: ellisis; + -o-text-overflow: ellipsis; text-overflow: ellipsis; } @@ -468,7 +468,7 @@ span.forums-avatar-right{ } a.bids_user { - font-family:微软雅黑; + font-family:"Microsoft YaHei"; color:#15bccf; font-size:14px; font-weight: bold; @@ -519,23 +519,23 @@ ul.tool li{list-style-type:none; height:auto;} .font_index{ font-size:22px; - font-family: 微软雅黑; + font-family: "Microsoft YaHei"; color:#068d9c; } .font_aram{ font-size: 14px; - font-family: 微软雅黑; + font-family: "Microsoft YaHei"; font-weight: bold; } .font_content{ font-size:14px; - font-family: 微软雅黑; + font-family: "Microsoft YaHei"; color:#FFFFFF; } .time_project{ font-size:12px; - font-family:微软雅黑; + font-family: "Microsoft YaHei"; } .line_bottom{ margin-top: 1px; @@ -548,7 +548,7 @@ ul.tool li{list-style-type:none; /*white-space:nowrap;*/ overflow: hidden; height:35px; - width:200px; + width:200px; text-align: left; font-family: arial; font-size:12px; @@ -573,7 +573,7 @@ ul.tool li{list-style-type:none; } .font_title_tag{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight:bold; padding-top:3px; padding-bottom:3px; @@ -582,7 +582,7 @@ ul.tool li{list-style-type:none; } .font_title_left{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight:bold; padding-left: 10px; padding-top:3px; @@ -591,7 +591,7 @@ ul.tool li{list-style-type:none; /*color:#05a8bb;*/ } .font_small_watch{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight:bold; color:#15bccf; } @@ -607,7 +607,7 @@ ul.tool li{list-style-type:none; } .font_welcome{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight: bold; font-size: 16px; color:#6d6e6e; @@ -628,13 +628,13 @@ ul.tool li{list-style-type:none; } .font_welcome_Cdescription{ - font-family: 微软雅黑; + font-family: "Microsoft YaHei"; font-size: 16px; color: #5c5c5c; } .font_welcome_tdescription{ - font-family: '微软雅黑'; + font-family: "Microsoft YaHei"; font-size: 16px; color: #5c5c5c; text-align: justify; @@ -654,7 +654,7 @@ ul.tool li{list-style-type:none; border: 1px solid #e5dfc7; float: left; display: block; - height:80px; + height:80px; width: 80px; } @@ -675,7 +675,7 @@ ul.tool li{list-style-type:none; } .font_welcome_feature{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight: bold; font-size: 16px; color:#09b2c8; @@ -684,7 +684,7 @@ ul.tool li{list-style-type:none; .info-course{ padding-left: 8px; - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight:bold; font-size:16px; color:#4d4d4d; @@ -699,7 +699,7 @@ ul.tool li{list-style-type:none; .info_font{ padding-left: 8px; - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight:bold; font-size:16px; color:#4d4d4d; @@ -707,7 +707,7 @@ ul.tool li{list-style-type:none; word-break: break-all; } .font_lighter{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; color:#acaeb1; font-size:13px; } @@ -717,7 +717,7 @@ ul.tool li{list-style-type:none; font-size:13px; } .font_lighter2{ - font-family:'微软雅黑'; + font-family: "Microsoft YaHei"; color:#9a9a9a; font-size:14px; } @@ -725,7 +725,7 @@ ul.tool li{list-style-type:none; .font_lighter_welcome{ color:#acaeb1; font-size:12px; - font-family:微软雅黑; + font-family: "Microsoft YaHei"; } .justify_side > span{ text-align: justify; @@ -754,7 +754,7 @@ ul.tool li{list-style-type:none; padding-left: 10px; } .font_tool{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-size:14px; color: #1a1a1a; padding-left: 6px; @@ -768,7 +768,7 @@ ul.tool li{list-style-type:none; float:left; display:inline-block; /*margin-top: 50px;*/ - padding-left: 20px; + /*padding-left: 20px;*/ max-width: 315px; margin: 0; padding: 0; @@ -915,7 +915,7 @@ ul.user_project_sort li{list-style-type:none; /*h写的样式*/ .lbadding{float:left; padding-left: 10px} /*huang*/ .rlbadding{float:left; padding-left: 0px; margin-top:40px} /*huang*/ -.lbadding h7{letter-spacing: -0.0125em; font-weight:700}/*未用*/ +/*.lbadding h7{letter-spacing: -0.0125em; font-weight:700}*//*未用*/ .newsplitcontentright{float:right; width:49%;}/*huang*/ .newsplitcontentleft{float:left; width:49%;}/*huang*/ .newsplitcontentall{float:left; padding-left: 30px; width:95%} @@ -946,17 +946,20 @@ a.logical_int{ color: #ed8924; } -.contextdescription2{font-family: '微软雅黑'; - font-size:12px; - font-weight:ligher; - color:#7e7e7e; - } +.contextdescription2 { + font-family: "Microsoft YaHei"; + font-size: 12px; + font-weight: lighter; + color: #7e7e7e; +} ul.context_projects{margin:0px; padding-left:0em;} ul.context_projects ul {padding-left:1.6em;} -ul.context_projects li {list-style-type:none; - height:50px;} +ul.context_projects li { + list-style-type:none; + height:50px; +} /*字体*/ .more{float:right; padding-right:40px; text-decoration: underline; color: #95c3bc} @@ -984,7 +987,7 @@ ul.context_projects li {list-style-type:none; padding-top:12px; font-family: arial; font-size:12px; - font-weight:ligher; + font-weight:lighter; color:#7e7e7e; } @@ -998,7 +1001,7 @@ ul.context_projects li {list-style-type:none; .fontligher{ font-family: arial; font-size:12px; - font-weight:ligher; + font-weight:lighter; color:#505050; height: 34px; @@ -1058,14 +1061,14 @@ ul.context_projects li {list-style-type:none; font-size:24px; font-weight:bold; - text-decoration:; + text-decoration:none; color:#000000; } .firdtname_project{ font-size:12px; font-weight:bold; - text-decoration:; + text-decoration:none; color:#116699; @@ -1080,8 +1083,8 @@ ul.context_projects li {list-style-type:none; text-decoration: underline; } .last_active{ - color:AA9C84; - font-size:12px + color: #AA9C84; + font-size:12px; text-decoration: none; } ul.newprojects{ /*huang*/ @@ -1103,16 +1106,16 @@ ul.newprojects li{ /*huang 块状*/ border-bottom:5px #DBEDF4 solid; border-left:2px dotted #DBEDF4; min-height:260px; - line-height: :30px; + line-height: 30px; } -ul.newprojects li documenttext{ /*未wan*/ +/*ul.newprojects li documenttext{ *//*未wan*/ /*overflow: hidden;*/ - height: 260px; - width: 200px; - margin-right:auto; - - padding-top:10px; -} + /*height: 260px;*/ + /*width: 200px;*/ + /*margin-right:auto;*/ + /**/ + /*padding-top:10px;*/ +/*}*/ ul.newprojects2{ /*huang*/ margin: 0px; padding-left: 2em; @@ -1133,7 +1136,6 @@ ul.newprojects2 li{ .newfeedback h1{ color: inherit; - text-d } /***** Layout *****/ #wrapper {background: white;} @@ -1389,7 +1391,7 @@ table.attributes { width: 100% } table.attributes th { vertical-align: top; text-align: left; } table.attributes td { vertical-align: top; } -table.boards a.board, h3.comments { /*background: url(../images/comment.png) */no-repeat 0% 50%; padding-left: 5px; } +/*table.boards a.board, h3.comments {*background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 5px; }*/ table.boards td.topic-count, table.boards td.message-count {text-align:center;} table.boards td.last-message {font-size:80%;} @@ -1478,7 +1480,7 @@ margin-left:-10px; .project_right_tag{margin-top:44%;} .project_homepage_tag{float:left; margin-top:9%;color:#000000;} -.project_infor_tag{float:auto;color:#000000;padding-left: 15px;} +.project_infor_tag{/*float:auto;*/color:#000000;padding-left: 15px;} .project_page_tag{float:right;color:#C0C0C0; font-family: '微软雅黑';font-size: 13px;} .wiki_text{font-size:small;color:#000000;} .user_setting{float:right; color:#000000;padding-right: 10px;} @@ -1486,13 +1488,13 @@ margin-left:-10px; .project_right_tag{margin-top:40%;} .project_homepage_tag{padding-left:570px;color:#000000;} -.project_infor_tag{float:auto;color:#000000;padding-left: 15px; } +.project_infor_tag{/*float:auto;*/color:#000000;padding-left: 15px; } .project_page_tag{float:right;color:#C0C0C0; font-family: '微软雅黑';font-size: 13px;} .wiki_text{font-size:small;color:#000000;} .user_setting { float:right; - color:#000000; + /*color:#000000;*/ padding-right:10px; background-color: #CCCCBB; border-radius: 5px 5px 5px 5px; @@ -1523,7 +1525,7 @@ margin-left:-10px; margin-top: 50px; width:320px; - + /*font-family:微软雅黑,lucida grande,verdana;*/ font-size:12px; -webkit-border-radius:10px; @@ -1540,15 +1542,15 @@ margin-left:-10px; form {display: inline;} /*added by bai*/ - input[type="submit"].bid_btn { - padding-bottom: 5px; - width: 55px; - height: 25px; - font-family: '微软雅黑',Arial,Helvetica,sans-serif; +input[type="submit"].bid_btn { + padding-bottom: 5px; + width: 55px; + height: 25px; + font-family: '微软雅黑', Arial, Helvetica, sans-serif; font-size: 12px; color: #fff; padding: 0px; - background: #15bccf; + background: #15bccf; border-radius: 4px; border: 1px solid #15bccf; box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset; @@ -1557,20 +1559,20 @@ form {display: inline;} } input[type="button"].bid_btn { - padding-bottom: 5px; - width: 55px; - height: 25px; - font-family: '微软雅黑',Arial,Helvetica,sans-serif; + /*padding-bottom: 5px;*/ + width: 55px; + height: 25px; + font-family: '微软雅黑', Arial, Helvetica, sans-serif; font-size: 12px; color: #fff; padding: 0px; - background: #15bccf; + background: #15bccf; border-radius: 4px; border: 1px solid #15bccf; box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset; text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255); cursor: pointer; - } +} /*end */ fieldset {border: 1px solid #e4e4e4; margin:0;} @@ -1588,9 +1590,9 @@ blockquote { padding-bottom: 0.6em; margin-left: 1.4em; margin-right: 0.4em; - border-radius: 4px; # added by bai (边框变圆润) - font-family: 微软雅黑; - background: url(/images/requirements/reference.jpg) + border-radius: 4px; + font-family: "Microsoft YaHei"; + background: url('../images/requirements/reference.jpg') } blockquote blockquote { margin-left: 0;} @@ -1631,7 +1633,7 @@ fieldset#filters td.values select {min-width:130px;} fieldset#filters td.values input {height:1em;} fieldset#filters td.add-filter { text-align: right; vertical-align: top; } -.toggle-multiselect {/*background: url(../images/bullet_toggle_plus.png)*/ no-repeat 0% 40%; padding-left:8px; margin-left:0; cursor:pointer;} +.toggle-multiselect {/*background: url(../images/bullet_toggle_plus.png) no-repeat 0% 40%;*/ padding-left:8px; margin-left:0; cursor:pointer;} .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; } div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;} @@ -1763,7 +1765,7 @@ p.pagination {margin-top:8px; font-size: 90%} margin: 0; padding: 3px 0 3px 0; padding-left: 100px; /* width of left column containing the label elements *//*by young*/ - /*/*min-height: 1.8em;*/ by bai*/ + /*min-height: 1.8em;*/ clear:left; } @@ -2114,7 +2116,7 @@ button.tab-right { } #content .tabs_new ul li a.selected { - background-color: rgba(28, 158, 199, 0.68); # added by bai + background-color: rgba(28, 158, 199, 0.68); border: 1px solid #15BCCF; border-bottom: 1px solid #fff; color:#FFF; @@ -2186,7 +2188,7 @@ button.tab_new-right { } #content .tabs_new_enterprise ul li a.selected { - background-color: #9f4056; # added by bai + background-color: #9f4056; border: 1px solid #ac344f; border-bottom: 1px solid #fff; color:#FFF; diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index b73123590..2c93cca06 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -66,7 +66,9 @@ a .action-settings #header h1:before { font-family: Fontawesome; - + /* content: "\f0f0 ";*/ + padding-right: 5px; +} /*by young*/ .action-settings #header h1:before @@ -190,11 +192,7 @@ a .controller-gantts #header h1:before { font-family: Fontawesome; - - - /* content: "\f080";*/ - padding-right: 5px; } @@ -210,25 +208,16 @@ a .controller-welcome #header h1:before { font-family: Fontawesome; - - - -/* content: "\f015 ";*/ - +/* content: "\f015 ";*/ padding-right: 5px; font-weight: 100; } .controller-users #header h1:before { font-family: Fontawesome; - - padding-right: 5px; } -/* content: "\f0f0 ";*/ - padding-right: 5px; -} /*end*/ @@ -373,11 +362,10 @@ ul.projects li.root background-color:#fff; /*顶层导航颜色*/ color: #fff; font-size:13px; /* bai */ - font-family: 微软雅黑; + font-family: "Microsoft YaHei"; position:relative; padding:0; height:1px; - padding-top:0; /*by bai*/ border-radius: 5px;/*导航栏边角变圆*/ /*end*/ @@ -403,7 +391,6 @@ ul.projects li.root { /*by young*/ color:#fff; /*the color of the fonts*/ - font-weight:6px; padding:4px 3px } @@ -454,7 +441,7 @@ ul.projects li.root #main.nosidebar #content_ { width:auto; - float:center; + /*float:center;*/ min-height:800px; border: 1px solid #ffffff; } @@ -537,7 +524,7 @@ ul.projects li.root margin:4px 20px 20px; padding-bottom:15px; text-align:left - font-size: 18px; + /*font-size: 18px;*/ } #footer a:hover @@ -664,8 +651,8 @@ div.splitcontentleft h2 position:relative; z-index: 2; background: #fff;*/ - font-family:微软雅黑, "PT Sans", Helvetica, Arial; - font: color: #FFF; + /*font-family:"Microsoft YaHei", "PT Sans", Helvetica, Arial;*/ + /*font: color: #FFF;*/ transition:all .4s linear; -moz-transition:all .4s linear; -o-transition:all .4s linear; @@ -695,8 +682,9 @@ div.splitcontentleft h2 } #top-menu li a.my-page:before { font-family: Fontawesome; - content: "\f0c9 "; - + content: "\f0c9 "; + /* content: "\f0f0 ";*/ +} /*by young*/ #top-menu li a.home:before { font-family: Fontawesome; @@ -745,9 +733,6 @@ div.splitcontentleft h2 content: "\f08b "; } - -/* content: "\f0f0 ";*/ -} #top-menu #account a.logout:before { font-family: Fontawesome; /* content: "\f08b ";*/ @@ -1065,7 +1050,7 @@ input[type="submit"] html > body #content { - min-height:auto!important + /*min-height:auto !important;*/ } pre,code,.line-code @@ -1479,7 +1464,6 @@ div.pagination span { -moz-border-bottom-colors: none; border-image: none; } -} div.pagination span.current-page { /*color: rgb(153, 153, 153); add by huang*/ @@ -1548,7 +1532,6 @@ div.pagination_new span { -moz-border-bottom-colors: none; border-image: none; } -} div.pagination_new span.current-page { color: rgb(153, 153, 153); @@ -1745,7 +1728,7 @@ div.project-search-block { margin-bottom: 0px; padding: 10px; width: 95%; - border-top: 1px solid rgb(242,242,242); + border-top: 1px solid rgb(242,242,242); /*border-bottom: 1px solid rgb(223, 223, 223);*/ margin-left: auto; margin-right: auto; @@ -1833,7 +1816,7 @@ a.usage { /*end*/ a.bid_user { - font-family:微软雅黑; + font-family:"Microsoft YaHei"; color:#acaeb1; font-size:12px; } @@ -1850,7 +1833,7 @@ a.bid_course{ } a.bids_user { - font-family:微软雅黑; + font-family:"Microsoft YaHei"; color:#15bccf; font-size:14px; font-weight: bold; @@ -1866,10 +1849,10 @@ input[type='text'].noline { .noline { /*border-style: none; border-color: white;*/ - font-family:微软雅黑; /*modify by men*/ + font-family:"Microsoft YaHei"; /*modify by men*/ border: #d5dee9 1px solid; font-size: 12px; - color: #818283; # modified by bai + color: #818283; padding: 9px 5px; width: 98%; cursor: text; @@ -2096,7 +2079,7 @@ ul.message-for-user { list-style-type: none; margin: 0px; padding: 0px; - font-family: 微软雅黑,Verdana,sans-serif,宋体; + font-family: "Microsoft YaHei",Verdana,sans-serif,simsun; text-align: left; font-size: 10pt; width: 100%;