diff --git a/data/news/1new.yaml b/data/news/1new.yaml new file mode 100644 index 0000000000000000000000000000000000000000..032617cfb8054ff96e6fc85fc2896e640afb0a49 --- /dev/null +++ b/data/news/1new.yaml @@ -0,0 +1,6 @@ +title: News +content: + - {name: Announcement for 'openEulerOS Contribution Competition' Winner,time: 2019.09.01,url: news/banner.png} + - {name: Announcement for 'openEulerOS Contribution Competition' Winner,time: 2019.09.01} + - {name: Announcement for 'openEulerOS Contribution Competition' Winner,time: 2019.09.01} + - {name: Announcement for 'openEulerOS Contribution Competition' Winner,time: 2019.09.01} \ No newline at end of file diff --git a/data/news/2events.yaml b/data/news/2events.yaml new file mode 100644 index 0000000000000000000000000000000000000000..be460b13ba792ca498f68734d9209353a6f22e1c --- /dev/null +++ b/data/news/2events.yaml @@ -0,0 +1,6 @@ +title: Upcoming Events +content: + - {name: Announcement for 'openEulerOS Contribution Competition' Winner,time: 2019.09.01,url: news/banner.png} + - {name: Announcement for 'openEulerOS Contribution Competition' Winner,time: 2019.09.01} + - {name: Announcement for 'openEulerOS Contribution Competition' Winner,time: 2019.09.01} + - {name: Announcement for 'openEulerOS Contribution Competition' Winner,time: 2019.09.01} \ No newline at end of file diff --git a/themes/project/layouts/index.html b/themes/project/layouts/index.html index f560603772a436909a2beb0da663180b4206984c..a5f310ad5e0c899b0799a96563a1a79cf762dd4c 100644 --- a/themes/project/layouts/index.html +++ b/themes/project/layouts/index.html @@ -18,15 +18,19 @@ {{ partial "feature_case_client.html" . }} {{ partial "partner.html" . }} + {{ partial "footer.html" . }} - + {{ partial "scripts.html" . }} - \ No newline at end of file + + + + diff --git a/themes/project/layouts/partials/feature_case_client.html b/themes/project/layouts/partials/feature_case_client.html index 1e080e12f2cf4d1431c750f2374c266333e95198..7fcae1dcb6174efcacb529cf55fe72fc162ca56e 100644 --- a/themes/project/layouts/partials/feature_case_client.html +++ b/themes/project/layouts/partials/feature_case_client.html @@ -78,6 +78,42 @@ + +
+ {{ range .Site.Data.news }} +
+
+ {{ .title }} + More > +
+ + +
+ {{ end }} +
+
diff --git a/themes/project/layouts/partials/head.html b/themes/project/layouts/partials/head.html index e87d853ef8f1cd60e5ddcd99121babe6eb1ae6ac..3a22879092ffd86a110bcd2520851e7b339ef5e1 100644 --- a/themes/project/layouts/partials/head.html +++ b/themes/project/layouts/partials/head.html @@ -42,6 +42,7 @@ + {{ ` diff --git a/themes/project/layouts/partials/nav.html b/themes/project/layouts/partials/nav.html index 43a6d8dd3ab7f1d91d8a134c1579a649b1e725c0..80547e81690a1a8515e01bfa593d60cdd7a1eb82 100644 --- a/themes/project/layouts/partials/nav.html +++ b/themes/project/layouts/partials/nav.html @@ -44,11 +44,13 @@

+ 码云

+ 微信

diff --git a/themes/project/static/css/commen.css b/themes/project/static/css/commen.css new file mode 100644 index 0000000000000000000000000000000000000000..5cb219a8fb4169405c9b99ec10afef93d2f2a751 --- /dev/null +++ b/themes/project/static/css/commen.css @@ -0,0 +1,68 @@ +html { + overflow-x:auto; + overflow-y:scroll; + } + body, dl, dt, dd, ul, ol, li, pre, form, fieldset, input, p, blockquote, th, td { + font-weight:400; + margin:0; + padding:0; + } + h1, h2, h3, h4, h4, h5 { + margin:0; + padding:0; + } + body { + background-color:#FFFFFF; + color:#666666; + font-family:Helvetica,Arial,sans-serif; + font-size:12px; + padding:0 10px; + text-align:left; + } + select { + font-size:12px; + } + table { + border-collapse:collapse; + } + fieldset, img { + border:0 none; + } + fieldset { + margin:0; + padding:0; + } + fieldset p { + margin:0; + padding:0 0 0 8px; + } + legend { + display:none; + } + address, caption, em, strong, th, i { + font-style:normal; + font-weight:400; + } + table caption { + margin-left:-1px; + } + hr { + border-bottom:1px solid #FFFFFF; + border-top:1px solid #E4E4E4; + border-width:1px 0; + clear:both; + height:2px; + margin:5px 0; + overflow:hidden; + } + ol, ul { + list-style-image:none; + list-style-position:outside; + list-style-type:none; + } + caption, th { + text-align:left; + } + q:before, q:after, blockquote:before, blockquote:after { + content:””; + } \ No newline at end of file diff --git a/themes/project/static/css/custommobile.css b/themes/project/static/css/custommobile.css index f3fbd2cf125da4c743742074a3cd78e62d34b81a..993ba4b82839974e23c8b31ecfc2eb2716e799c3 100644 --- a/themes/project/static/css/custommobile.css +++ b/themes/project/static/css/custommobile.css @@ -118,6 +118,317 @@ text-decoration: none; border-bottom: 1px solid #ECECEC; } + .bannernew { + height: 280px; + } + .bannernew .content { + padding: .5rem .2rem; + } + .bannernew .content h2 { + font-size: 0.48rem; + font-family: "HuaweiSansBold"; + text-align: center; + } + .bannernew .content p { + width: auto; + font-size: .24rem; + line-height: .36rem; + margin: .35rem auto 0; + } + .bannernew .cards { + width: 90%; + position: static; + transform: translate(0, 0); + margin: 0 auto; + padding: 0px; + } + .bannernew .cards ul { + flex-wrap: wrap; + } + .bannernew .cards ul li { + width: 100%; + padding: .3rem; + } + .bannernew .cards ul a { + width: 50%; + } + + .bannernew .cards ul li .icon { + transform: scale(.7); + } + + .bannernew .cards ul a:nth-child(1) { + border-bottom: 1px solid #E3E9EB; + } + .bannernew .cards ul a:nth-child(2) { + border-bottom: 1px solid #E3E9EB; + } + .bannernew .cards ul a:nth-child(2n) { + border-right: 0; + } + .bannernew .cards ul a:nth-child(2n+1) { + border-right: 1px solid #E3E9EB; + } + .bannernew .cards ul li h3 { + font-size: .28rem; + margin: .3rem 0 .28rem; + } + .bannernew .cards ul li p { + font-size: .24rem; + line-height: .36rem; + padding: 0px; + } + .bannernew .cards ul li img { + height: 30px; + } + + +/* doc_nav */ +#heading-breadcrumbs{ + margin-bottom: 20px; +} +.container.docscontainer { + position: relative; + padding: 0; +} +.slide_nav { + display: flex !important; + align-items: center; + padding: 10px 15px 5px; + margin-bottom: 20px; + border-bottom: 1px solid #b5b5b5; +} +.slide_nav p { + margin: 0; +} + +.book-menu { + position: absolute; + width: 100%; + z-index: 100; + background: #fff; + top: 0; + left: 0; + padding: 0 15px; + transition: .3s; + transform: translateX(-100%); +} + +.container div.book-page { + margin-left: 0; + padding: 0 15px; +} + + .reason { + padding: 6.7rem .6rem .6rem; + } + .reason h2 { + font-size: 0.46rem; + margin-bottom: .38rem; + } + .reason .content_why { + flex-direction: column; + } + + .reason .content_why .detail { + margin-left: 0; + } + .reason .content_why .detail p { + font-size: .28rem; + line-height: .52rem; + } + .reason .content_why .detail p:nth-child(1) { + margin-bottom: .2rem; + } + .action { + padding: .6rem; + } + .action .active_box { + display: inline; + } + .action .active_box .active { + width: 100%; + margin-right: 0 !important; + } + .action .active_box .active:last-child { + margin-top: .8rem; + } + .action .active_box .active h2 { + font-size: 0.46rem; + font-weight: 600; + text-align: center; + display: block; + width: 100%; + position: relative; + border-bottom: 1px solid #b5b5b5; + } + .action .active_box .active h2 p { + line-height: inherit; + position: absolute; + right: 0; + bottom: 24px; + font-size: .24rem; + font-weight: 100; + } + .action .active_box .active ul li { + padding: .26rem .1rem .3rem; + border-bottom: 1px solid rgba(181, 181, 181, 0.5); + } + /*.action .active_box .active ul li:not(:last-child) { + border-bottom: 1px solid rgba(181, 181, 181, 0.5); + } + .action .active_box .active ul li:last-child { + border-bottom: 0px; + }*/ + .action .active_box .active ul li h6 { + font-size: .28rem; + } + .action .active_box .active ul li h6 i { + font-size: .22rem; + } + .action .active_box .active ul li p { + font-size: .24rem; + line-height: .4REM; + } + .partners { + padding: 0 0 .8rem 0; + } + .partners h2 { + font-size: 0.46rem; + margin-bottom: .4rem; + } + .partners .box { + width: 85%; + flex-wrap: wrap; + } + .partners .box img { + width: 25%; + } + .partners .box img:nth-child(2) { + width: 4.5rem; + } + .e_mail { + justify-content: space-around; + padding: .4rem 0; + height: 7.5rem; + background-position: top; + } + .e_mail h2 { + font-size: 0.46rem; + margin-bottom: 0; + } + .e_mail ul { + width: auto; + padding: 0px; + } + + .e_mail ul li { + justify-content: space-around; + } + + .e_mail ul li:last-child { + margin-bottom: 0; + } + .e_mail ul li h3 { + font-size: .38rem; + line-height: .44rem; + } + .e_mail ul li p { + font-size: .24rem; + margin-top: 0; + padding-right: 0; + } + .e_mail ul li .btn { + padding: .1rem .15rem; + font-size: .26rem; + font-family: "HuaweiSansBold"; + } + + .e_mail ul li > div { + width: 60%; + } + + .container .heading { + margin: 0; + } + + .container .client-header h2 { + font-size: .46rem; + font-weight: 600; + } + + .container p.lead { + margin: 0; + } + + .container .owl-carousel.customers { + display: flex; + flex-wrap: wrap; + justify-content: space-around; + margin-bottom: .4rem; + } + + .container .owl-carousel.customers .item { + margin: 0; + width: 35%; + display: flex; + justify-content: center; + } + + .container .owl-carousel.customers .item img { + transform: scale(.75); + } + + .divmail ul li a { + margin: 0px; + } + + .main .down_banner { + padding: .3rem .4rem; + height: auto; + } + .main .down_banner p { + margin: 0; + font-size: .3rem; + font-family: "HuaweiSansBold"; + } + .main .content { + padding: 0 .4rem; + flex-direction: column-reverse; + } + .main .content .search_v { + width: auto; + padding-top: .3rem; + } + .main .content .search_v li .vision { + display: flex; + flex-wrap: wrap; + } + .main .content .search_v li .vision p { + width: 20%; + margin-bottom: 0; + } + .main .content .nav { + margin-right: 0; + } + .main .content .nav li { + padding: .3rem 0; + } + .main .content .nav li h3 { + display: flex; + justify-content: space-between; + align-items: flex-end; + } + .main .content .nav li h3 span.title { + font-size: .4rem; + font-weight: 700; + } + .main .content .nav li h4 { + font-size: .28rem; + } + .main .content .nav li p { + font-size: .24rem; + } footer { padding: .4rem .6rem; } @@ -143,6 +454,18 @@ margin-top: .4rem; width: auto; } + #mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + display: none; + } + + .table-bordered.table-striped td:last-child { + white-space:nowrap; + } } @media screen and (min-width: 768px) and (max-width: 1280px) { .isPc { @@ -235,13 +558,94 @@ color:inherit; text-decoration: none; } - + .bannernew .content { + padding: 1.8rem .4rem; + } + .bannernew .content h2 { + font-size: 0.6rem; + text-align: center; + } + .bannernew .content p { + width: auto; + } + .bannernew .cards { + bottom: -35%; + padding: 0px; + } + .bannernew .cards ul li p { + padding: .18rem; + } + .reason { + padding: 245px 30px 70px; + } + .reason .content_why { + flex-direction: column; + } + .reason .content_why .detail { + margin-left: 0; + width: 580px; + } + .action .active_box .active h2 { + font-size: 0.45rem; + } + .action .active_box .active h2 p { + line-height: inherit; + } + .partners { + padding: 0 0 70px 0; + } + .container .heading { + margin: 0; + } + .owl-carousel.customers { + display: flex; + flex-wrap: wrap; + justify-content: space-around; + } + .owl-carousel.customers .item { + width: 25%; + margin: 25px 0 0 30px; + } + + .e_mail ul { + width: auto; + padding: 0px; + } + .e_mail ul li { + justify-content: space-around; + } + .e_mail ul li > div { + width: 55%; + } + .e_mail ul li .btn { + margin-left: 20px; + } + .content { + padding: 0 20px; + } + .main .down_banner { + padding: .3rem .4rem; + height: auto; + } + .main .down_banner p { + margin: 0; + font-size: .5rem; + font-family: "HuaweiSansBold"; + } footer { padding: 20px 30px 20px; } footer .notice { width: 360px; } + #mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + display: none; + } .isPad { display: block !important; } diff --git a/themes/project/static/css/custommobile2.css b/themes/project/static/css/custommobile2.css new file mode 100644 index 0000000000000000000000000000000000000000..7f06a84d7f7e4995993c93f1b985148a849283bc --- /dev/null +++ b/themes/project/static/css/custommobile2.css @@ -0,0 +1,261 @@ +@media screen and (min-width: 319px) and (max-width: 767px) { + .isPc { + display: none; + } + .isH5 { + display: block; + } + header { + padding: 0 0.4rem; + position: relative; + border-bottom: 1px solid #ECECEC; + display: flex; + align-items: center; + justify-content: space-between; + /* height: 0.8rem; */ + } + .nav_table{ + display: flex; + width: 100%; + justify-content: space-between; + } + + header .topbar { + display: flex; + align-items: center; + margin-bottom: 0; + list-style-type: none; + /* padding: 15px 0px; */ + } + + header .topbar li { + height: 50px; + } + + header .topbar .search { + white-space: nowrap; + } + + header .topbar .search a.list, + header .topbar .search a.list:hover, + header .topbar .search a.list:active { + color:inherit; + text-decoration: none; + padding: 15px 10px; + } + + header .navbar-brand { + padding: 5px 0; + height: auto; + } + + header .navbar-brand>img { + width: 80%; + } + + header h2 { + font-size: 0.4rem; + margin: 0; + } + header ul li { + padding: 0 0.1rem; + font-size: 0.28rem; + } + header ul li.search { + display: flex; + /* margin-right: .2rem; */ + } + header ul li img { + width: 16px; + } + header #nav { + position: absolute; + top: 51px; + left: 0; + width: 100%; + display: none; + background: #fff; + color: #333; + z-index: 1000; + padding: 0 .3rem; + box-shadow: 0 5px 10px 0 #D3D3D3; + } + header #nav p { + line-height: .52rem; + padding: .14rem 0; + font-size: .26rem; + border-bottom: 1px solid #ECECEC; + text-transform: uppercase; + margin: 0; + } + header #nav p:not(:last-child) { + border-bottom: 1px solid #ECECEC; + } + header #nav .second_menu { + position: relative; + } + header #nav .second_menu i { + width: 0; + height: 0; + border-left: 5px solid transparent; + border-top: 5px solid #000; + border-right: 5px solid transparent; + position: absolute; + right: 0; + top: 50%; + transform: translate(-50%, 0px); + } + header #nav .menu_list { + display: none; + } + header #nav .menu_list p { + padding: 0.14rem .3rem; + } + header #nav a.list, + header #nav a.list:hover, + header #nav a.list:active { + color:inherit; + text-decoration: none; + border-bottom: 1px solid #ECECEC; + } + footer { + padding: .4rem .6rem; + } + footer .foot { + display: block; + } + footer .foot .contact { + display: flex; + display: -webkit-flex; + justify-content: space-between; + align-items: flex-end; + -webkit-box-align: flex-end; + } + footer .foot .contact h2 { + font-size: 0.46rem; + margin-bottom: 0; + } + footer .foot .contact p { + font-size: .24rem; + } + footer .foot .contact svg { + width: 12px; + } + footer .foot .notice { + margin-top: .4rem; + width: auto; + } +} +@media screen and (min-width: 768px) and (max-width: 1280px) { + .isPc { + display: none; + } + header { + padding: 0 .6rem; + position: relative; + display: flex; + justify-content: space-between; + } + header .topbar { + display: flex; + align-items: center; + margin: 0 595px; + list-style-type: none; + padding: 20px 0; + } + header .topbar .search { + white-space: nowrap; + } + header .topbar .search a.list, + header .topbar .search a.list:hover, + header .topbar .search a.list:active { + color:inherit; + text-decoration: none; + padding: 0 10px; + } + header .navbar-brand { + padding: 5px 15px; + } + header h2 { + font-size: 0.38rem; + margin: 0px; + } + header ul li { + padding: 0 0.1rem; + font-size: 0.28rem; + display: flex; + } + header ul li img { + width: 18px; + } + header #nav { + position: absolute; + top: 62px; + left: 0; + width: 100%; + display: none; + background: #fff; + color: #333; + z-index: 100; + padding: 0 .6rem; + box-shadow: 0 5px 10px 0 #D3D3D3; + } + header #nav p { + line-height: .52rem; + padding: .14rem 0; + font-size: .28rem; + border-bottom: 1px solid #ECECEC; + text-transform: uppercase; + } + header #nav p:not(:last-child) { + border-bottom: 1px solid #ECECEC; + } + header #nav .second_menu { + position: relative; + } + header #nav .second_menu i { + width: 0; + height: 0; + border-left: 5px solid transparent; + border-top: 5px solid #000; + border-right: 5px solid transparent; + position: absolute; + right: 0; + top: 50%; + transform: translate(-50%, 0px); + } + header #nav .menu_list { + display: none; + } + header #nav .menu_list p { + padding: 0.14rem .3rem; + } + header #nav a.list, + header #nav a.list:hover, + header #nav a.list:active + { + color:inherit; + text-decoration: none; + } + + footer { + padding: 20px 30px 20px; + } + footer .notice { + width: 360px; + } + .isPad { + display: block !important; + } + .pc_box { + display: none !important; + } +} +@media screen and (min-width: 1280px) { + .isPc { + display: block; + } + .isH5 { + display: none; + } +} diff --git a/themes/project/static/css/home.css b/themes/project/static/css/home.css index 5b1e5ab4861f898832651f110ed0d50e34005199..6f71566ed9d43880b7b7f013aa8b05970012a709 100644 --- a/themes/project/static/css/home.css +++ b/themes/project/static/css/home.css @@ -5,7 +5,8 @@ flex-direction: column; align-items: center; justify-content: center; - background: url(../img/banner1.png); + background: url(../img/banner.jpg); + background-size: 100% 100%; } .banner .banner_title { @@ -558,3 +559,72 @@ height: 18px; } +/* ------------------- news -------------------- */ +.news { + display: flex; + justify-content: space-between; + /* align-items: flex-end; */ +} +.new_title { + display: inline-block; +} +.new_title::after { + content: ''; + width: 100%; + height: 7px; + display: block; + margin-top: 16px; + background: #467FBF; +} +.new_title span { + font-family: HuaweiSans; + font-size: 40px; + font-weight: 400; + color: #333333; + line-height: 36px; +} +.new_title a { + font-family: HuaweiSans; + font-size: 14px; + font-weight: 400; + color: #3399FF; + line-height: 36px; + margin-left: 20px; +} +.new_title a:hover, +.new_title a:active, +.new_title a:focus { + color: #3399FF; + text-decoration: none; +} +.new_content ul { + margin-top: 50px; +} +.new_content li { + width: 500px; + padding: 16px 0 48px 10px; +} +.new_content li p { + width: 90%; + font-size: 20px; + line-height: 28px; +} +.new_content li div { + font-size: 14px; +} +.new_content li:not(.news_bg) { + border-bottom: 1px solid #b5b5b5; +} +.news_bg { + background-color: #999; +} +.news_bg div { + display: inline-block; + border: 1px solid #ffffff; + color: #ffffff; + padding: 5px 10px; + +} +.news_bg p { + color: #ffffff; +} \ No newline at end of file diff --git a/themes/project/static/css/style.blue.css b/themes/project/static/css/style.blue.css index 49d2972de3336e0461f5cb1d9ee30993fefff546..735e220757712648fdf8976f9a141f1689903ece 100644 --- a/themes/project/static/css/style.blue.css +++ b/themes/project/static/css/style.blue.css @@ -509,7 +509,7 @@ p { /* 404 */ #error-page { text-align: center; - margin-top: 40px; + margin-top: 20%; margin-bottom: 100px; } #error-page h4 { @@ -544,6 +544,12 @@ p { background-color: #ffffff; border-color: #467fbf; } +.notFound { + height: 100vh; + margin-top: -62px; + margin-bottom: -122px; +} + diff --git a/themes/project/static/img/banner.jpg b/themes/project/static/img/banner.jpg new file mode 100644 index 0000000000000000000000000000000000000000..701a07eee86ed0bb439e8fc87476d86060fbc9a0 Binary files /dev/null and b/themes/project/static/img/banner.jpg differ