소스 검색

Merge branch 'update' of Adyn/medgis-ru-assets into master

4개의 변경된 파일251개의 추가작업 그리고 0개의 파일을 삭제
  1. 125 0
      app/assets/styles/content/centerbar/full-news.scss
  2. 126 0
      app/www/css/all.css
  3. 0 0
      app/www/css/all.css.map
  4. 0 0
      app/www/css/all.min.css

+ 125 - 0
app/assets/styles/content/centerbar/full-news.scss

@@ -145,8 +145,133 @@
             font-family: $fontopensans;
             font-size: 15px;
             margin: 20px 0;
+
+            img {
+                float: left;
+                margin-right: 20px;
+                margin-bottom: 23px;
+                margin-top: 6px;
+            }
         }
 
+        ul {
+            margin: 0;
+            padding: 0;
+            list-style-type: none;
+
+            li {
+                padding-left: 12px;
+                position: relative;
+                font-size: 16px;
+                font-family: $fontopensans;
+                color: #404040;
+                line-height: 1.5;
+                margin-bottom: 10px;
+
+                &:before {
+                    content: '';
+                    display: block;
+                    position: absolute;
+                    left: 0;
+                    top: 10px;
+                    background: #265e86;
+                    border-radius: 50%;
+                    width: 6px;
+                    height: 6px;
+                }
+            }
+        }
+
+        ol {
+            margin: 0;
+            padding: 0;
+            list-style-type: none;
+
+            li {
+                counter-increment: step-counter;
+                font-size: 16px;
+                font-family: $fontopensans;
+                color: #404040;
+                line-height: 1.5;
+
+                &:before {
+                    content: counter(step-counter) ".";
+                    font-size: 11px;
+                    font-family: $fontopensans;
+                    color: #004d7b;
+                    font-weight: bold;
+                }
+            }
+        }
+
+        table {
+            width: 100%;
+            border-spacing: 0;
+            border: 1px solid #e6e6e6;
+            margin-top: 20px;
+
+            th {
+                background: #e6e6e6;
+                font-size: 11px;
+                font-family: $fontopensans;
+                color: #004d7b;
+                text-transform: uppercase;
+                line-height: 1.2;
+                padding: 17px 0 17px 12px;
+                border: 1px solid #e6e6e6;
+                text-align: left;
+
+                &:nth-child(1) {
+                    width: 19%;
+                }
+
+                &:nth-child(2) {
+                    width: 23%;
+                }
+            }
+
+            td {
+                font-size: 14px;
+                font-family: $fontopensans;
+                color: #404040;
+                line-height: 1.714;
+                padding: 14px 0 14px 12px;
+                border: 1px solid #e6e6e6;
+                vertical-align: top;
+
+                &:nth-child(1) {
+                    width: 13%;
+                }
+
+                &:nth-child(2) {
+                    width: 23%;
+                }
+            }
+
+            .mobileth {
+                display: none;
+            }
+        }
+
+        .col3__item {
+            display: inline-block;
+            width: calc(33% - 0.25em - 10px);
+            margin-right: 20px;
+
+            &:last-child {
+                margin-right: 0;
+            }
+        }
+
+        .col2__item {
+            display: inline-block;
+            width: calc(50% - 0.25em - 10px);
+            margin-right: 20px;
+
+            &:last-child {
+                margin-right: 0;
+            }
+        }
     }
 
     &__other-materials {

+ 126 - 0
app/www/css/all.css

@@ -1568,6 +1568,132 @@ body {
     font-size: 15px;
     margin: 20px 0; }
 
+.full-news__text p img {
+    float: left;
+    margin-right: 20px;
+    margin-bottom: 23px;
+    margin-top: 6px;
+}
+
+.full-news__text ul {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+}
+
+.full-news__text ul li {
+    padding-left: 12px;
+    position: relative;
+    font-size: 16px;
+    font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
+    color: #404040;
+    line-height: 1.5;
+    margin-bottom: 10px;
+}
+
+.full-news__text ul li:before {
+    content: '';
+    display: block;
+    position: absolute;
+    left: 0;
+    top: 10px;
+    background: #265e86;
+    border-radius: 50%;
+    width: 6px;
+    height: 6px;
+}
+
+.full-news__text ol {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+}
+
+.full-news__text ol li {
+    counter-increment: step-counter;
+    font-size: 16px;
+    font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
+    color: #404040;
+    line-height: 1.5;
+}
+
+.full-news__text ol li:before {
+    content: counter(step-counter) ".";
+    font-size: 11px;
+    font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
+    color: #004d7b;
+    font-weight: bold;
+}
+
+.full-news__text table {
+    width: 100%;
+    border-spacing: 0;
+    border: 1px solid #e6e6e6;
+    margin-top: 20px;
+}
+
+.full-news__text table th {
+    background: #e6e6e6;
+    font-size: 11px;
+    font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
+    color: #004d7b;
+    text-transform: uppercase;
+    line-height: 1.2;
+    padding: 17px 0 17px 12px;
+    border: 1px solid #e6e6e6;
+    text-align: left;
+}
+
+.full-news__text table th:nth-child(1) {
+    width: 19%;
+}
+
+.full-news__text table th:nth-child(2) {
+    width: 23%;
+}
+
+.full-news__text table td {
+    font-size: 14px;
+    font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
+    color: #404040;
+    line-height: 1.714;
+    padding: 14px 0 14px 12px;
+    border: 1px solid #e6e6e6;
+    vertical-align: top;
+}
+
+.full-news__text table td:nth-child(1) {
+    width: 13%;
+}
+
+.full-news__text table td:nth-child(2) {
+    width: 23%;
+}
+
+.full-news__text table .mobileth {
+    display: none;
+}
+
+.full-news__text .col3__item {
+    display: inline-block;
+    width: calc(33% - 0.25em - 10px);
+    margin-right: 20px;
+}
+
+.full-news__text .col3__item:last-child {
+    margin-right: 0;
+}
+
+.full-news__text .col2__item {
+    display: inline-block;
+    width: calc(50% - 0.25em - 10px);
+    margin-right: 20px;
+}
+
+.full-news__text .col2__item:last-child {
+    margin-right: 0;
+}
+
 .full-news__other-materials {
   margin: 20px 0; }
   .full-news__other-materials-read-all {

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
app/www/css/all.css.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
app/www/css/all.min.css


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.