Skip to content

E
edx-platform
Commit a2fd7703 by XuYS
Options

关于我们页面完善

parent a6e28150
Showing with 54 additions and 46 deletions
lms/djangoapps/branding/api.py
...@@ -176,14 +176,14 @@ def _footer_navigation_links(): ...@@ -176,14 +176,14 @@ def _footer_navigation_links():
} }
for link_name, link_url, link_title in [ for link_name, link_url, link_title in [
("about", marketing_link("ABOUT"), _("About")), ("about", marketing_link("ABOUT"), _("About")),
("enterprise", marketing_link("ENTERPRISE"), # ("enterprise", marketing_link("ENTERPRISE"),
_("{platform_name} for Business").format(platform_name=platform_name)), # _("{platform_name} for Business").format(platform_name=platform_name)),
("blog", marketing_link("BLOG"), _("Blog")), # ("blog", marketing_link("BLOG"), _("Blog")),
("news", marketing_link("NEWS"), _("News")), # ("news", marketing_link("NEWS"), _("News")),
("help-center", settings.SUPPORT_SITE_LINK, _("Help Center")), # ("help-center", settings.SUPPORT_SITE_LINK, _("Help Center")),
("contact", marketing_link("CONTACT"), _("Contact")), # ("contact", marketing_link("CONTACT"), _("Contact")),
("careers", marketing_link("CAREERS"), _("Careers")), # ("careers", marketing_link("CAREERS"), _("Careers")),
("donate", marketing_link("DONATE"), _("Donate")), # ("donate", marketing_link("DONATE"), _("Donate")),
] ]
if link_url and link_url != "#" if link_url and link_url != "#"
] ]
......
lms/static/sass/course/instructor/_instructor_2.scss
...@@ -1633,7 +1633,7 @@ input[name="subject"] { ...@@ -1633,7 +1633,7 @@ input[name="subject"] {
color:#B72667; color:#B72667;
text-align: center; text-align: center;
padding: ($baseline/2) 0; padding: ($baseline/2) 0;
font-family: "Open Sans",Verdana,Geneva,sans-serif,sans-serif; font-family: "OrhonChaganTig","Open Sans",Verdana,Geneva,sans-serif,sans-serif;
font-size: 15px; font-size: 15px;
border-bottom: 1px solid #B72667; border-bottom: 1px solid #B72667;
margin-bottom: $baseline; margin-bottom: $baseline;
...@@ -1645,7 +1645,7 @@ input[name="subject"] { ...@@ -1645,7 +1645,7 @@ input[name="subject"] {
color:#008801; color:#008801;
text-align: center; text-align: center;
padding: ($baseline/2) 0; padding: ($baseline/2) 0;
font-family: "Open Sans",Verdana,Geneva,sans-serif,sans-serif; font-family: "OrhonChaganTig","Open Sans",Verdana,Geneva,sans-serif,sans-serif;
font-size: 15px; font-size: 15px;
border-bottom: 1px solid #008801; border-bottom: 1px solid #008801;
margin-bottom: $baseline; margin-bottom: $baseline;
......
lms/static/sass/multicourse/_about_pages.scss
.container.about { .container.about {
padding: 20px 30px 120px; padding: 20px;
> nav { > nav {
margin-bottom: ($baseline*4); margin-right: 80px;
text-align: center; text-align: center;
width: flex-grid(12); height: 100%;
&::after { &::after {
@extend %faded-hr-divider; @extend %faded-hr-divider;
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
border-bottom: 3px solid transparent; border-bottom: 3px solid transparent;
color: $lighter-base-font-color; color: $lighter-base-font-color;
font-family: $serif; font-family: $serif;
font-style: italic; font-style: normal;
display: inline-block; display: inline-block;
letter-spacing: 1px; letter-spacing: 0px;
margin: 0px 15px; margin: 0px 15px;
padding: 20px 10px; padding: 20px 10px;
@include transition(all 0.15s linear 0s); @include transition(all 0.15s linear 0s);
...@@ -34,14 +34,14 @@ ...@@ -34,14 +34,14 @@
.vision { .vision {
h1 + hr { h1 + hr {
margin-bottom: ($baseline*4); margin-right: ($baseline*4);
} }
.our-mission { .our-mission {
border-bottom: 1px solid rgb(220,220,220); border-right: 1px solid rgb(220,220,220);
@include clearfix(); @include clearfix();
margin: 0 auto 100px; margin: 0 auto 100px;
padding-bottom: 40px; padding-right: 40px;
.logo { .logo {
@include border-right(1px solid rgb(200,200,200)); @include border-right(1px solid rgb(200,200,200));
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
> img { > img {
display: inline-block; display: inline-block;
margin-top: 26px; margin-left: 26px;
max-height: 60px; max-height: 60px;
} }
} }
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
h2.mission-quote { h2.mission-quote {
@include box-sizing(border-box); @include box-sizing(border-box);
@include float(right); @include float(right);
font-style: italic; font-style: normal;
line-height: 1.4; line-height: 1.4;
margin: 0; margin: 0;
@include padding(5px, 0px, 5px, 20px); @include padding(5px, 0px, 5px, 20px);
...@@ -72,30 +72,31 @@ ...@@ -72,30 +72,31 @@
} }
.message { .message {
border-bottom: 1px solid rgb(220,220,220); border-right: 1px solid rgb(220,220,220);
@include clearfix(); @include clearfix();
margin-bottom: ($baseline*4); margin-right: 80px;
padding-bottom: 80px; padding-right: 80px;
position: relative; position: relative;
hr { hr {
bottom: 0px; bottom: 0px;
display: none; display: none;
margin: 0; margin: 0;
position: absolute; position: absolute;
width: 100%; height: 100%;
} }
h2 { h2 {
border-bottom: 1px solid rgb(200,200,200); border-right: 1px solid rgb(200,200,200);
padding-bottom: 15px; padding-right: 15px;
margin-bottom: 0;
margin-top: 15px;
} }
.photo { .photo {
@include box-sizing(border-box); @include box-sizing(border-box);
background: rgb(255,255,255); background: rgb(255,255,255);
border: 1px solid rgb(210,210,210); border: 1px solid rgb(210,210,210);
margin-top: 37px; margin-left: 37px;
padding: 1px; padding: 1px;
width: flex-grid(3); width: flex-grid(3);
...@@ -108,20 +109,27 @@ ...@@ -108,20 +109,27 @@
> article { > article {
@include box-sizing(border-box); @include box-sizing(border-box);
@include float(left); // @include float(left);
@include padding-left($baseline); @include padding-left($baseline);
width: flex-grid(9); width: flex-grid(9);
p {
text-indent: 20px;
padding: 5px 8px;
line-height: 1.3;
}
} }
&.left { &.left {
.photo { .photo {
@include float(left); @include float(left);
@include margin-right(flex-gutter()); @include margin-right(flex-gutter());
margin-bottom: 20px;
} }
} }
&.right { &.right {
.photo { .photo {
margin-top: 20px;
@include float(right); @include float(right);
@include margin-left(flex-gutter()); @include margin-left(flex-gutter());
} }
...@@ -160,7 +168,7 @@ ...@@ -160,7 +168,7 @@
a { a {
display: block; display: block;
letter-spacing: 1px; letter-spacing: 0px;
margin: 0px -20px; margin: 0px -20px;
@include padding(12px, 0px, 12px, 20px); @include padding(12px, 0px, 12px, 20px);
text-align: left; text-align: left;
...@@ -184,19 +192,19 @@ ...@@ -184,19 +192,19 @@
} }
> h2 { > h2 {
border-bottom: 1px solid rgb(220,220,220); border-right: 1px solid rgb(220,220,220);
margin-bottom: ($baseline*2); margin-right: ($baseline*2);
padding-bottom: $baseline; padding-right: $baseline;
} }
} }
.response { .response {
margin-bottom: ($baseline*2); margin-right: ($baseline*2);
h3 { h3 {
font-family: $sans-serif; font-family: $sans-serif;
font-weight: 700; font-weight: 700;
margin-bottom: ($baseline*0.75); margin-right: ($baseline*0.75);
} }
} }
} }
...@@ -204,10 +212,10 @@ ...@@ -204,10 +212,10 @@
.press { .press {
.press-story { .press-story {
border-bottom: 1px solid rgb(220,220,220); border-right: 1px solid rgb(220,220,220);
@include clearfix(); @include clearfix();
margin-bottom: ($baseline*2); margin-right: ($baseline*2);
padding-bottom: 40px; padding-right: 40px;
&:last-child { &:last-child {
border: none; border: none;
...@@ -237,12 +245,12 @@ ...@@ -237,12 +245,12 @@
width: flex-grid(10); width: flex-grid(10);
header { header {
margin-bottom: ($baseline/2); margin-right: ($baseline/2);
h3 { h3 {
font-family: $sans-serif; font-family: $sans-serif;
font-weight: 700; font-weight: 700;
margin-bottom: ($baseline/4); margin-right: ($baseline/4);
} }
span.post-date { span.post-date {
...@@ -283,7 +291,7 @@ ...@@ -283,7 +291,7 @@
padding: 0px; padding: 0px;
li { li {
margin-bottom: ($baseline/2); margin-right: ($baseline/2);
} }
} }
} }
......
lms/static/sass/partials/base/_variables.scss
...@@ -337,7 +337,7 @@ $staff-color: $uxpl-pink-base !default; ...@@ -337,7 +337,7 @@ $staff-color: $uxpl-pink-base !default;
// ---------------------------- // ----------------------------
// #TYPOGRAPHY // #TYPOGRAPHY
// ---------------------------- // ----------------------------
$sans-serif: 'Open Sans', $verdana, sans-serif !default; $sans-serif: 'OrhonChaganTig','Open Sans', $verdana, sans-serif !default;
$monospace: Monaco, 'Bitstream Vera Sans Mono', 'Lucida Console', monospace !default; $monospace: Monaco, 'Bitstream Vera Sans Mono', 'Lucida Console', monospace !default;
$body-font-family: $sans-serif !default; $body-font-family: $sans-serif !default;
$serif: $georgia !default; $serif: $georgia !default;
......
lms/static/sass/views/_program-marketing-page.scss
...@@ -430,12 +430,12 @@ ...@@ -430,12 +430,12 @@
} }
h2{ h2{
font-size: 1.5rem; font-size: 1.5rem;
font-family: "Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif; font-family: "OrhonChaganTig","Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;
margin: 1.25rem 0; margin: 1.25rem 0;
text-transform: none; text-transform: none;
} }
h1, h2, h3, h4, h5, h6{ h1, h2, h3, h4, h5, h6{
font-family: "Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif; font-family: "OrhonChaganTig","Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;
} }
.col-centered{ .col-centered{
float: none !important; float: none !important;
...@@ -454,7 +454,7 @@ ...@@ -454,7 +454,7 @@
label, input, select, button, textarea{ label, input, select, button, textarea{
display: block; display: block;
width: 100%; width: 100%;
font-family: "Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif; font-family: "OrhonChaganTig","Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;
font-style: normal; font-style: normal;
margin-bottom: 0.5rem !important; margin-bottom: 0.5rem !important;
&.has-error{ &.has-error{
...@@ -537,7 +537,7 @@ ...@@ -537,7 +537,7 @@
} }
#accordion-group { #accordion-group {
font-family: "Open Sans", Arial, Helvetica, sans-serif; font-family: "OrhonChaganTig","Open Sans", Arial, Helvetica, sans-serif;
.accordion-item { .accordion-item {
border-bottom: 1px solid palette(primary, dark); border-bottom: 1px solid palette(primary, dark);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment