Bladeren bron

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

Alexander Larkin 8 jaren geleden
bovenliggende
commit
26f3e894ef

+ 1 - 0
app/assets/styles/all.scss

@@ -53,6 +53,7 @@
 @import "content/centerbar/usefulinfo";
 @import "content/centerbar/selectedline";
 @import "content/centerbar/comments";
+@import "blocks/opinion";
 //
 @import "content/centerbar/errorblock";
 //

+ 71 - 0
app/assets/styles/blocks/opinion.scss

@@ -0,0 +1,71 @@
+.opinion {
+
+    &__container {
+        float: right;
+        width: 33%;
+        margin-left: 40px;
+        background: #ebebeb;
+        padding: 15px 10px;
+        box-sizing: border-box;
+        border-radius: 20px 0 0 0;
+
+        &:before,
+        &:after {
+            display: block;
+            clear: both;
+            content: '';
+        }
+    }
+
+    &__title {
+        font-size: 20px;
+        font-family: $fontcuprum;
+        color: #004d7b;
+        line-height: 1.2;
+        margin-bottom: 10px;
+    }
+
+    &__text {
+        font-size: 14px;
+        font-family: $fontopensans;
+        color: #404040;
+        line-height: 1.714;
+        margin-bottom: 10px;
+        &:before,
+        &:after {
+            display: block;
+            clear: both;
+            content: '';
+        }
+    }
+
+    &__person-info {
+        width: calc(100% - 72px);
+        vertical-align: top;
+        float: left;
+    }
+
+    &__person-img {
+        margin-right: 10px;
+        border-radius: 50%;
+        width: 62px;
+        height: 62px;
+        float: left;
+    }
+
+    &__person-name {
+        font-size: 17px;
+        font-family: $fontcuprum;
+        color: #004d7b;
+        line-height: 1.2;
+        margin: 0 0 5px;
+    }
+
+    &__person-job {
+        font-size: 13px;
+        font-family: $fontopensans;
+        color: #a2a1a1;
+        line-height: 1.2;
+        margin-bottom: 10px !important;
+    }
+}

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

@@ -127,6 +127,13 @@
         padding-bottom: 10px;
         border-bottom: 1px solid #ebebeb;
 
+        &:before,
+        &:after {
+            display: block;
+            clear: both;
+            content: '';
+        }
+
         h2 {
             font-family: $fontcuprum;
             font-size: 25px;

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

@@ -1553,6 +1553,10 @@ body {
   margin-bottom: 40px;
   padding-bottom: 10px;
   border-bottom: 1px solid #ebebeb; }
+  .full-news__text:before, .full-news__text:after {
+    display: block;
+    clear: both;
+    content: ''; }
   .full-news__text h2 {
     font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
     font-size: 25px;
@@ -2449,6 +2453,63 @@ body {
   font-size: 13px;
   color: #f00; }
 
+.opinion__container {
+  float: right;
+  width: 33%;
+  margin-left: 40px;
+  background: #ebebeb;
+  padding: 15px 10px;
+  box-sizing: border-box;
+  border-radius: 20px 0 0 0; }
+  .opinion__container:before, .opinion__container:after {
+    display: block;
+    clear: both;
+    content: ''; }
+
+.opinion__title {
+  font-size: 20px;
+  font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
+  color: #004d7b;
+  line-height: 1.2;
+  margin-bottom: 10px; }
+
+.opinion__text {
+  font-size: 14px;
+  font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
+  color: #404040;
+  line-height: 1.714;
+  margin-bottom: 10px; }
+  .opinion__text:before, .opinion__text:after {
+    display: block;
+    clear: both;
+    content: ''; }
+
+.opinion__person-info {
+  width: calc(100% - 72px);
+  vertical-align: top;
+  float: left; }
+
+.opinion__person-img {
+  margin-right: 10px;
+  border-radius: 50%;
+  width: 62px;
+  height: 62px;
+  float: left; }
+
+.opinion__person-name {
+  font-size: 17px;
+  font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
+  color: #004d7b;
+  line-height: 1.2;
+  margin: 0 0 5px; }
+
+.opinion__person-job {
+  font-size: 13px;
+  font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
+  color: #a2a1a1;
+  line-height: 1.2;
+  margin-bottom: 10px !important; }
+
 .errorblock {
   background: #ebebeb;
   display: -webkit-flex;

File diff suppressed because it is too large
+ 0 - 0
app/www/css/all.css.map


File diff suppressed because it is too large
+ 0 - 0
app/www/css/all.min.css


BIN
app/www/img/cite.png


Some files were not shown because too many files changed in this diff