浏览代码

Merge branch 'hotfix/fix-style' into develop

zhixin 7 年之前
父节点
当前提交
6fcc332778
共有 2 个文件被更改,包括 21 次插入29 次删除
  1. 1 1
      docs/_includes/header.html
  2. 20 28
      docs/assets/css/ads.css

+ 1 - 1
docs/_includes/header.html

@@ -20,7 +20,7 @@
 <link href="../assets/css/docs.min.css" rel="stylesheet">
 <link href="../assets/css/docs.min.css" rel="stylesheet">
 <link href="../assets/css/sidenav.css?v={{ site.current_version }}" rel="stylesheet">
 <link href="../assets/css/sidenav.css?v={{ site.current_version }}" rel="stylesheet">
 <link href="../assets/css/style.css?v={{ site.current_version }}&m=2" rel="stylesheet">
 <link href="../assets/css/style.css?v={{ site.current_version }}&m=2" rel="stylesheet">
-<link href="../assets/css/ads.css?m=2" rel="stylesheet">
+<link href="../assets/css/ads.css?m=3" rel="stylesheet">
 
 
 <!--[if lt IE 9]><script src="../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
 <!--[if lt IE 9]><script src="../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
 <script src="../assets/js/ie-emulation-modes-warning.js"></script>
 <script src="../assets/js/ie-emulation-modes-warning.js"></script>

+ 20 - 28
docs/assets/css/ads.css

@@ -1,41 +1,33 @@
 #carbonads {
 #carbonads {
-  display: block;
+  border: none!important;
+  border-radius: 4px;
+  width: 330px!important;
+  height: auto!important;
+  padding: 15px!important;
   overflow: hidden;
   overflow: hidden;
-  padding: 1em;
-  font-family: Verdana, "Helvetica Neue", Helvetica, sans-serif;
-  line-height: 1.5;
+  margin-bottom: 10px
 }
 }
 
 
-#carbonads span {
-  position: relative;
-  display: block;
-  overflow: hidden;
+.carbon-text,.carbon-poweredby {
+  display: block!important;
+  margin-left: 145px!important;
+  font-size: 13px!important;
+  line-height: 16px!important;
+  color: #333 !important;
 }
 }
 
 
-.carbon-img {
-  float: left;
-  margin-right: 1em;
+.bs-docs-header .carbon-text,
+.bs-docs-header .carbon-poweredby {
+  color: #cdbfe3 !important;
 }
 }
 
 
-.carbon-img img {
-  display: block;
-  line-height: 1;
+.carbon-poweredby {
+  margin-top: 10px;
 }
 }
 
 
-.carbon-text {
-  display: block;
+.carbon-img>img {
   float: left;
   float: left;
-  max-width: calc(100% - 130px - 1em);
-  text-align: left;
-}
-
-.carbon-poweredby {
-  position: absolute;
-  right: 0; // You can also set the position to the "left" with the value of calc(130px + carbon-text’s font size). If the font-size is 12px, you’ll want to set the left value as 142px. It’ll align the .carbon-text with .carbon-poweredby
-  bottom: 0;
   display: block;
   display: block;
-  font-size: .8em;
-  text-transform: uppercase;
-  line-height: 1;
-  letter-spacing: 1px;
+  width: 130px;
+  height: 100px
 }
 }