Merge branch 'task-on.com/faq' into 'master'

support новая верстка



See merge request !22

common/modules/support/assets/src/css/style_add_3.css

-
-
-
-
-.container_white {
-  background-color: #fff;
-  padding-top: 40px;
-  font-size: 14px;
-  color: #484a4e;
-  line-height: 18px;
-}
-.container_white p:not(:last-child) {
-  margin-bottom: 7px;
-}
-.container_white h2 {
-  font-size: 29px;
-  color: #2d3642;
-  margin-top: 20px;
-    margin-bottom: 10px;
-    font-weight: bold;
-}
-.container_white strong {
-  font-size: 14px;
-}
-.container_white .form-control {
-    display: block;
-    width: 100%;
-    height: 26px;
-    padding: 2px 4px;
-    font-size: 12px;
-    border-radius: 2px;
-    float: left;
-    margin-right: 10px;
-    margin-bottom: 20px;
-    line-height: 16px;
-}
-.label_p, .label_p strong {
-  color: #2f3336;
-  font-size: 14px;
-  line-height: 16px;
-  margin-bottom: 10px;
-}
-
-.important_box {
-   background-color: #e85656;
-  height: 28px;
-  width: 96px;
-    border-radius: 2px;
-    position: relative;
-    margin-bottom: 15px;
-}
-.important_box .important_button {
-  height: 20px;
-  width: 24px;
-  background-color: #fff;
-  border-radius: 2px;
-  background-image:url('../images_new/important_button.png');
-  background-repeat: no-repeat;
-  background-position: 9px 7px;
-  cursor: pointer;
-  position: absolute;
-  right: 4px;
-  top: 4px;
-}
-.important_box .important_button:hover {
-  background-color: #ffea00;
-}
-.important_button_active {
-  right: auto;
-  left: 4px;
-}
-.important_box p {
-  font-size: 12px;
-  color: #fff;
-  
-}
-.important_button_text_1 {
-  padding-left: 12px;
-  padding-top: 5px;
-}
-.important_button_text_2 {
-  padding-left: 32px;
-  padding-top: 5px;
-  display: none;
-}
-.important_button_text_active {
-  background-color: #919597;
-}
-.important_button_text_active .important_button_text_1{
-  display: none;
-}
-  .important_button_text_active .important_button_text_2{
-  display: block;
-}
-.text_box_form textarea {
-  width: 100%;
-  height: 120px;
-  resize: none;
-  padding: 15px;
-  border: 1px solid #cbcbcb;
-  border-radius: 0 0 3px 3px;
-  color: #484a4e;
-  font-size: 14px;
-  line-height: 18px;
-  margin-bottom: 15px;
-}
-
-.gray_button {
-  color: #5e5e5e !important;
-  background-color: #efefef;
-  padding: 5px 10px;
-  font-size: 14px;
-  line-height: 18px;
-  border: none;
-  border-radius: 3px;
-  outline: none;
-  margin-bottom: 15px;
-}
-.gray_button:hover {
-  background-color: #d1d1d1;
-}
-.gray_button i {
-  margin-left: 10px;
-}
-
-.panel-body.panel-body-ex-3 {
-    border: none;
-    border-left: 7px solid #ffb6b6;
-    box-shadow: -1px 1px 1px 1px #f2f2f2;
-    background-color: #fff;
-    margin-top: 20px;
-    margin-bottom: 20px;
-}
-.text-mes p span {
-    color: #999999;
-}
-.text-mes p {
-  margin: 0 !important;
-}
-.text_box_form_bg {
-  background-color: #f5f5f5;
-  padding: 15px;
-}
-.file_box_wr .glyphicon-file {
-  font-size: 16px;
-  color: #ccd0d5;
-}
-.color_gray {
-    color: #999;
-}
-.file_box_wr {
-  margin-bottom: 10px;
-}
-.gray_button_poz {
-  margin-right: 17px;
-  margin-top: 7px;
-}
-.commentary_col {
-  background-color: #f5f5f5;
-  padding: 15px 20px;
-  margin-top: 10px;
-  margin-bottom: 20px;
-}
-
-.commentary_box img {
-  margin-right: 10px;
-  padding: 1px;
-  border: 1px solid #ccc;
-  margin-bottom: 12px;
-  margin-top: 5px;
-}
-.commentary_box_ok {
-  color: #7cb336;
-  text-decoration: underline;
-}
-.commentary_box_ok:hover {
-  color: #7cb336;
-  text-decoration: none;
-}
-.commentary_box_dell {
-  color: #424a4e;
-  text-decoration: underline;
-}
-.commentary_box_dell:hover {
-  color: #424a4e;
-  text-decoration: none;
-}
-.line_3 {
-  border-bottom: 1px solid #d9d9d9;
-  margin: 10px 0;
-}
-.marg_l_20 {
-  margin-left: 20px;
-}
-.marg_l_40 {
-  margin-left: 40px;
-}
-.marg_l_60 {
-  margin-left: 60px;
-}
-.commentary_box .glyphicon-file {
-  font-size: 16px;
-  color: #ccd0d5;
-  padding-right: 5px;
-}
-.commentary_box_ok {
-  margin-top: 5px;
-  display: inline-block;
-
-}
-.dropdown_file {
-  position: relative;
-  cursor: pointer;
-}
-.dropdown_box_file {
-  position: absolute;
-  z-index: 2;
-  right: -20px;
-  top: 0px;
-  display: none;
-  padding-top: 30px;
-}
-.dropdown_box_file:before {
-  position: absolute;
-  content: '';
-  right: 35px;
-  top: 25px;
-  width: 0px;
-  height: 0px;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-bottom: 5px solid #484a4e;
-}
-.dropdown_box_file ul {
-  display: block;
-  overflow-y: auto;
-  overflow-x: hidden;
-  width: 260px;
-  height: 300px;
-  padding: 10px;
-  background-color: #484a4e;
-  border-radius: 3px;
-}
-.dropdown_box_file li {
-  padding-left: 22px;
-  color: #fff;
-  font-size: 12px;
-  margin: 6px 0;
-  position: relative;
-}
-.dropdown_box_file li a {
-  color: #fff;
-}
-.dropdown_box_file li .glyphicon {
-  font-size: 16px;
-  position: absolute;
-  top: 3px;
-  left: 0;
-  color: #ccd0d5;
-}
-
-.dropdown_file:hover .dropdown_box_file {
-  display: block;
-}
-.dropdown_box_file ::-webkit-scrollbar{
-    background: #5e6166;  
-    width: 10px;
-   }
-
-.dropdown_box_file ::-webkit-scrollbar-thumb{background: #e5e5e5;}
-
-
-
-
-
-@media only screen and (max-width: 992px) {
-
-
-
-}
-@media only screen and (max-width: 767px) {
-
-}
-
-@media only screen and (max-width: 479px) { 
-
-
-}
\ No newline at end of file

common/modules/support/views/support/create.php

@@ -16,7 +16,7 @@ use common\modules\support\models\redmine\RedmineHelper;
                 <h2>Создание задачи</h2>
             </div>
             <div class="col-md-6 col-xs-6 col-sm-12">
-                <div class="logo_taskon">
+                <div class="logo_taskon _sup">
                     <span>Разработанно в:  </span>
                     <a href=""><img src="/images/logo_taskon.png" height="44" width="135" alt=""></a>
                 </div>

common/modules/support/views/support/index.php

@@ -19,7 +19,7 @@ GeneratorAsset::register($this);
                 <h2><strong>Список задач</strong></h2>
             </div>
             <div class="col-md-6 col-xs-6 col-sm-12">
-                <div class="logo_taskon">
+                <div class="logo_taskon _sup">
                     <span>Разработанно в:  </span>
                     <a href=""><img src="/images/logo_taskon.png" height="44" width="135" alt=""></a>
                 </div>

frontend/web/css/style_add_06.06.16.css

@@ -384,6 +384,10 @@
   margin-bottom: 115px;
 }
 
+.logo_taskon._sup {
+  margin-bottom: 0px;
+}
+
 .develop_platform {
   display: inline-block;
   height: 0;