From 45fdea598a18bd122f06dec39c56698208c7fc75 Mon Sep 17 00:00:00 2001 From: xiaopow Date: Mon, 23 Mar 2015 00:59:52 +0800 Subject: [PATCH 1/6] commit for saving changes --- css/custom.css | 168 +++++++++++++++++- ...essed-man-in-coat-520x245.jpg => coat.jpg} | Bin .../{Square-Reader-520x245.jpg => phone.jpg} | Bin ...as_co_uk_mizxflux-520x245.png => shoe.png} | Bin images/social/fb.png | Bin 0 -> 4343 bytes images/social/rss.png | Bin 0 -> 963 bytes index.html | 163 ++++++++++++----- 7 files changed, 286 insertions(+), 45 deletions(-) rename images/main/{well-dressed-man-in-coat-520x245.jpg => coat.jpg} (100%) rename images/main/{Square-Reader-520x245.jpg => phone.jpg} (100%) rename images/main/{FireShot-Screen-Capture-357-adidas-Originals-I-mi-ZX-FLUX-Photo-Print-App-www_adidas_co_uk_mizxflux-520x245.png => shoe.png} (100%) create mode 100644 images/social/fb.png create mode 100644 images/social/rss.png diff --git a/css/custom.css b/css/custom.css index 6e7ce8b..f4a1322 100644 --- a/css/custom.css +++ b/css/custom.css @@ -1 +1,167 @@ -/* You can include your custom styling here */ \ No newline at end of file +body { + background-color: rgb(248, 249, 250); + min-width: 330px; +} +/*Navigation*/ + +.navbar>.container .navbar-brand, .navbar>.container-fluid .navbar-brand { + margin-left: -15px; +} + + + +.navbar { + background: #fff; + border-bottom: 2px solid #d9e0e2; + font: 200 1em 'Source Sans Pro',Arial,Helvetica,sans-serif; + height: 50px; +} + +.navbar-brand { + padding: 13.5px 13.5px; +} + +#nav-left a { + font-family: 'Fjalla One',sans-serif; + font-weight: 400; + font-size: 16px; + background: transparent; + color: #879096; + opacity: .6; + border-bottom: 2px solid transparent; + padding-left: 0; + padding-right: 0; + margin-right: 16px; + height: 50px; + -webkit-font-smoothing: antialiased; +} + +#nav-left a:first-child { + margin-left: 2px; +} + +#nav-left .active a { + border-color: #ff3c1f; + color: #ff3c1f; + opacity: 1; +} + +#nav-left a:hover { + border-color: #ff3c1f; + color: #ff3c1f; + opacity: 1; +} + +#navbar-right { + float: right; + margin: 0; +} + +@media (max-width: 991px) { + #navbar-right{ + margin-right: -15px; + } +} + +#navbar-right a { + text-align: center; + color: #4e5860; + padding-top: 15px; +} + +#navbar-right a:hover { + color: #ef4423; + text-decoration: none; +} + +.navbar-right li{ + display: inline-block; + box-shadow: inset 1px 0 0 0 rgba(0,0,0,0.05); + min-width: 50px; + max-width: 90px; + height: 50px; +} + /*navbar search*/ +.form-group { + margin-bottom: 0; +} +.navbar-form { + margin-top: 6px; + padding-right: 6px; + padding-left: 0px; +} +#navform { + background-color: rgb(247, 249, 249); + width: 244px; + height: 36px; +} +#navsearch { + min-width: 30px; +} +#navsearch a { + padding-right: 15; +} + /*navbar social follow*/ +#fb, #rss, #twitter, #follow { + box-shadow: none; +} +#rss { + min-width: 30px; +} +#rss a { + padding-left: 10px; + padding-right: 0; +} +#twitter { + min-height: 50px; + padding-top: 15px; +} +#fb a{ + padding-right: 5px; +} +#follow small { + font-size: 10px; + font-weight: 800; +} + + /*Feed*/ +#feed { + background-color: rgb(255, 255, 255); + float: left; + width: 325px; + border-right-style: solid; + border-color: rgb(217, 224, 226); + border-right-width: 1px; +} +.container-feed { + height: 800px; + width: 325px; + +} + + /*Content*/ +#main-content { + padding-top: 10px; +} +@media (min-width: 1200px) { + #main-content { + margin-left: 325px; + padding-top: 22px + } + #support-banner { + margin-bottom: 12px; + } +} +.container-content { + max-width: 830px; + height: 800px; +} +.content { + background-color: rgb(255, 255, 255); + border: 1px solid #d9e0e2; + height: 800px; + padding-top: 30px; +} +#support-banner { + text-align: center; +} \ No newline at end of file diff --git a/images/main/well-dressed-man-in-coat-520x245.jpg b/images/main/coat.jpg similarity index 100% rename from images/main/well-dressed-man-in-coat-520x245.jpg rename to images/main/coat.jpg diff --git a/images/main/Square-Reader-520x245.jpg b/images/main/phone.jpg similarity index 100% rename from images/main/Square-Reader-520x245.jpg rename to images/main/phone.jpg diff --git a/images/main/FireShot-Screen-Capture-357-adidas-Originals-I-mi-ZX-FLUX-Photo-Print-App-www_adidas_co_uk_mizxflux-520x245.png b/images/main/shoe.png similarity index 100% rename from images/main/FireShot-Screen-Capture-357-adidas-Originals-I-mi-ZX-FLUX-Photo-Print-App-www_adidas_co_uk_mizxflux-520x245.png rename to images/main/shoe.png diff --git a/images/social/fb.png b/images/social/fb.png new file mode 100644 index 0000000000000000000000000000000000000000..b823c6b95265ff3d81e8a38f754471ee1ea84a17 GIT binary patch literal 4343 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 literal 0 HcmV?d00001 diff --git a/images/social/rss.png b/images/social/rss.png new file mode 100644 index 0000000000000000000000000000000000000000..9c304e279a35ec2b0127bb9b9b2ca35e517cc6ea GIT binary patch literal 963 zcmV;!13dhRP)z7|^A&|<@vnrI=qz@Va~b;FL0iMU~5NZc3~Xkyry z$if6Su8oNrNHmc|S7IUrMG+G;K|@I(e5o{uKucS&pYOf z>EA)$4z7H_)F{&h_+dr(*+W-{JOY zD&56=St7(pj1n;;OQ}bi8EMYcuZ+IW(HA-YAE+o`N9M(bF^;BIz& z#Dgzz?l8Z+S1h=9GaGj@H%}u7X-bSrVqW;=_fyQhLbaRTK{h>4Z8bx0arZVqf6TxT z8=m8lU7SBceU3aO<`QWv96U3}g=3uggk$?T@_I3HYX{G~K~`b(^WsXKYj|L&P?a`G zqa?&kXe^K>JpCFkeZ{uDTsX?N?-HBzKgQrLE*xiitgy$xR%Yjgv?(m_$m}HRM;LmQ zHJcgU%a)h<@lz&$D|WN?Nv0>694l}~A8DDi@t^b87ib?KY5CXL-5Z#%GjXlJ)hp_vK!{>M*xxNBH + -
-
-