Merge pull request #236 from vdvibhu20/ui-fixes

witty123 · web-flow · commit 27df59591aba · 2018-07-18T16:08:03.000+05:30
Ui fixes
diff --git a/examples/views/about-course.hbs b/examples/views/about-course.hbs
@@ -86,11 +86,11 @@
 
                     </div>
                     <div class="button-container row justify-content-center">
-                        <div class="button-solid col-6">
+                        <div class="button-solid col-5">
                             <button>BUY NOW TO ENROLL</button>
                         </div>
 
-                        <div class="button-dashed col-6">
+                        <div class="button-dashed col-5">
                             <button>ENROLL VIA OTP</button>
                         </div>
                     </div>
diff --git a/examples/views/doubts.hbs b/examples/views/doubts.hbs
@@ -102,7 +102,7 @@
                 Quo essent postulant te, dicant libris nostrum in nec. Quo albucius consetetur et, vis probo veritus volumus ea. Eu nibh saepe mnesarchum pro, qui prompta scripserit no, has errem timeam ex. Per quis solum prodesset in. Pri id populo intellegat, tollit pericula gloriatur duo cu.
             </div>
         </div>
-        <div class="row doubt">
+         <div class="row doubt">
             <div class="d-flex flex-row doubt-head">
                 <div class="left flex-row mr-auto">
                     <div class="round-img">
diff --git a/sass/styles/_media-query.scss b/sass/styles/_media-query.scss
@@ -32,3 +32,4 @@
 @import "media-query/media.arrangement";
 @import "media-query/media.sidebar.scss";
 @import "media-query/media.pill";
+@import "media-query/media.doubt";
diff --git a/sass/styles/elements/elements.navigation.scss b/sass/styles/elements/elements.navigation.scss
@@ -5,6 +5,7 @@
   top:0;
   background: $white;
   width: 100%;
+  height: 90px;
   max-height:100px;
   z-index: 200;
   display: flex;
diff --git a/sass/styles/media-query/media.about.course.scss b/sass/styles/media-query/media.about.course.scss
@@ -19,9 +19,15 @@
     position: relative;
     width: 100%;
     top: 0;
-      .button-dashed {
-        margin: 0;
-      }
+    margin-top: 35px;
+
+    &.slide-right{
+      transform: unset;
+    }
+    
+    .button-dashed {
+      margin: 0;
+    }
   }
 
   .o-summary .para {
@@ -95,6 +101,4 @@
   .o-buy-top {
     display: none;
   }
-}
-
-
+}
diff --git a/sass/styles/media-query/media.card.layout.scss b/sass/styles/media-query/media.card.layout.scss
@@ -89,10 +89,6 @@
     width: 10%;
   }
 
-  .button-dashed {
-    margin: 20px auto;
-  }
-
   .card, .card-text, .card-heading {
     height: auto;
   }
@@ -130,10 +126,6 @@
     width: 25%;
   }
 
-  .button-dashed {
-    margin: 20px auto;
-  }
-
   .card-mentor-text {
     text-align: center;
     display: block;
diff --git a/sass/styles/media-query/media.doubt.scss b/sass/styles/media-query/media.doubt.scss
@@ -0,0 +1,43 @@
+@media screen and (max-width: 575px){
+    .o-doubt{
+        padding: 40px 0;
+
+        .head{
+            padding: 0 7%;
+        }
+
+        .doubt-head{
+            .round-img {
+                @include dimensions(35px, 35px)
+            }
+    
+            .author-name {
+                font-size: $card-md;
+                margin-left: 13px;
+    
+                .time {
+                    font-size: $card-sm;
+                    color: $navLink;
+                }
+            }
+    
+            .text {
+                margin-right: 10px;
+                font-size: $card-md;
+            }
+    
+            .reply {
+                width: 8%;
+                min-width: 73px;
+                font-size: $card-sm;
+                height: 28px;
+            }
+        }
+    }
+
+    .doubt-body{
+        text-align: justify;
+        font-size: $card-md;
+    }
+}
+
diff --git a/sass/styles/media-query/media.headings.scss b/sass/styles/media-query/media.headings.scss
@@ -19,5 +19,9 @@
     padding-right: 15px;
     margin-bottom: 30px;
   }
+
+  .heading-u{
+    font-size: $global-font-size;
+  }
 }
 
diff --git a/sass/styles/media-query/media.navigation.scss b/sass/styles/media-query/media.navigation.scss
@@ -34,6 +34,7 @@
   .main-nav{
     padding-top: 10px;
     padding-bottom: 10px;
+    height: 60px;
 
     .hamburger-parent{
       font-size: $global-font-size;
diff --git a/sass/styles/media-query/media.o-client-add.scss b/sass/styles/media-query/media.o-client-add.scss
@@ -23,7 +23,6 @@
     .button-row {
       margin-top: 20px;
     }
-
   }
 }
 
@@ -85,4 +84,6 @@
       }
     }
   }
+
+  
 }
diff --git a/sass/styles/objects/o-about-course/o-about-course.scss b/sass/styles/objects/o-about-course/o-about-course.scss
@@ -37,8 +37,8 @@
     @include margin(67px, 0, 0, 0);
   }
 
-  .para{
-    @include margin(38px, 0, 0, 0);
+  .rating{
+    @include margin(0, 0, 38px, 0);
   }
 
   .key{
diff --git a/sass/styles/objects/o-about-course/o-buy-right.scss b/sass/styles/objects/o-about-course/o-buy-right.scss
@@ -12,18 +12,18 @@
   position: fixed;
   top: 145px;
   transition: all 0.35s ease;
-  right: -14px;
+  right: 0;
   z-index: 100;
   max-height: 730px;
 
   .card{
     @include dimensions(100%, 100%);
-    overflow-y: scroll;
+    overflow: hidden;
   }
 
   .button-container{
     margin-top: 23px;
-    margin-bottom: 10px;
+    margin-bottom: 20px;
   }
 
   .button-solid{
@@ -37,7 +37,7 @@
   }
 
   .card-video{
-    @include dimensions(100%, 336px);
+    @include dimensions(100%, 300px);
     position: relative;
     cursor: pointer;
   }
@@ -81,7 +81,7 @@
 
   .course-features{
       &>.row{
-        margin-bottom: 30px;
+        padding-bottom: 6%;
       }
 
       .img-desc{
diff --git a/sass/styles/objects/o-about-course/o-buy-top.scss b/sass/styles/objects/o-about-course/o-buy-top.scss
@@ -9,6 +9,7 @@
 .o-buy-top{
   @include dimensions(100%, 90px);
   position: fixed;
+  top: 90px;
   z-index: 101;
   padding: 10px 4%;
   background-color: $vp-background;
diff --git a/sass/styles/objects/o-doubt/o-doubt.scss b/sass/styles/objects/o-doubt/o-doubt.scss
@@ -2,15 +2,14 @@
 	background-color: $nav-border;
 	padding: 40px 7%;
 
-	.heading-u {
-	    font-size: $font-md;
-	    padding-bottom: 20px;
-	}
-
 	.right-head-button {
 		max-width: 200px;
 	}
 
+	.left{
+        width: 55%;
+    }
+
 	.doubts-box {
 		padding: 0;
 		background-color: #fff;
@@ -32,6 +31,7 @@
 		.author-name {
 			font-size: 0.88rem;
 			margin-left: 13px;
+			overflow: hidden;
 
 			.time {
 				font-size: 1rem;
@@ -42,11 +42,12 @@
 		.text {
 			margin-right: 10px;
 			font-size: 1.11rem;
-			color: #ff6666
+			color: $button-element-level;
 		}
 
 		.reply {
 			width: 11%;
+			min-width: 95px;
 		}
 	}
 
diff --git a/sass/styles/objects/o-overview-course/o-overview-course.scss b/sass/styles/objects/o-overview-course/o-overview-course.scss
@@ -22,6 +22,7 @@
     @include dimensions(100%, 100%);
     position: absolute;
     top: 0;
+    left: 0;
   }
 
   .para{

Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,6 @@`
`89`	`89`	`width: 10%;`
`90`	`90`	`}`
`91`	`91`
`92`		`- .button-dashed {`
`93`		`- margin: 20px auto;`
`94`		`- }`
`95`		`-`
`96`	`92`	`.card, .card-text, .card-heading {`
`97`	`93`	`height: auto;`
`98`	`94`	`}`
`@@ -130,10 +126,6 @@`
`130`	`126`	`width: 25%;`
`131`	`127`	`}`
`132`	`128`
`133`		`- .button-dashed {`
`134`		`- margin: 20px auto;`
`135`		`- }`
`136`		`-`
`137`	`129`	`.card-mentor-text {`
`138`	`130`	`text-align: center;`
`139`	`131`	`display: block;`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,9 @@`
`19`	`19`	`padding-right: 15px;`
`20`	`20`	`margin-bottom: 30px;`
`21`	`21`	`}`
	`22`	`+`
	`23`	`+ .heading-u{`
	`24`	`+ font-size: $global-font-size;`
	`25`	`+ }`
`22`	`26`	`}`
`23`	`27`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`	`.button-row {`
`24`	`24`	`margin-top: 20px;`
`25`	`25`	`}`
`26`		`-`
`27`	`26`	`}`
`28`	`27`	`}`
`29`	`28`
`@@ -85,4 +84,6 @@`
`85`	`84`	`}`
`86`	`85`	`}`
`87`	`86`	`}`
	`87`	`+`
	`88`	`+`
`88`	`89`	`}`