Alexey Boroda / bubochka

Commit 599c309c2c559866fd1183d5889ee7c283b00df6

Authored by Виталий
1 parent 2deb527b

qwerty

Showing 4 changed files with 55 additions and 1 deletions   Show diff stats
Inline Side-by-side
app/views/layouts/main.php
  Show/Hide comments   View file @599c309
... ... @@ -107,6 +107,18 @@ $this->registerJsFile(Yii::$app->request->baseUrl.'/js/new-basket.js',['position
107 107 <span><b>удалить</b></span>
108 108 </div>
109 109 </td>
  110 + <td>
  111 + <div class="fasovka">
  112 + <div class="style">
  113 + <input type="radio" name="fasovka" data-cost="217.10" data-id="999" id="f0" checked="">
  114 + <label for="f0">1 кг <span style="font-size:10px;color:#363636;">03-01-003</span></label>
  115 + </div>
  116 + <div class="style">
  117 + <input type="radio" name="fasovka" data-cost="960.00" data-id="1000" id="f1">
  118 + <label for="f1">5 кг <span style="font-size:10px;color:#363636;">03-01-004</span></label>
  119 + </div>
  120 + </div>
  121 + </td>
110 122 <td class="basket-modal-count">
111 123 <div style="display: inline-block">
112 124 <span class="b-count-txt">Количество</span>
... ... @@ -139,6 +151,19 @@ $this-&gt;registerJsFile(Yii::$app-&gt;request-&gt;baseUrl.&#39;/js/new-basket.js&#39;,[&#39;position
139 151 <span><b>удалить</b></span>
140 152 </div>
141 153 </td>
  154 + <td>
  155 + <div class="fasovka">
  156 + <div class="style">
  157 + <input type="radio" name="fasovka" data-cost="217.10" data-id="999" id="f10" checked="">
  158 + <label for="f10">1 кг <span style="font-size:10px;color:#363636;">03-01-003</span></label>
  159 + </div>
  160 +
  161 + <div class="style">
  162 + <input type="radio" name="fasovka" data-cost="960.00" data-id="1000" id="f11">
  163 + <label for="f11">5 кг <span style="font-size:10px;color:#363636;">03-01-004</span></label>
  164 + </div>
  165 + </div>
  166 + </td>
142 167 <td class="basket-modal-count">
143 168 <div style="display: inline-block">
144 169 <span class="b-count-txt">Количество</span>
... ...
css/new-style.css
  Show/Hide comments   View file @599c309
... ... @@ -74,6 +74,18 @@
74 74 width: 180px; }
75 75 .table-basket tr td.basket-modal-count {
76 76 width: 165px; }
  77 + .table-basket .fasovka {
  78 + background: none;
  79 + padding: 0; }
  80 + .table-basket .fasovka label {
  81 + float: left; }
  82 + .table-basket .fasovka input {
  83 + float: left;
  84 + margin-top: 3px; }
  85 + .table-basket .fasovka .style {
  86 + margin-top: 5px; }
  87 + .table-basket .fasovka .style:first-child {
  88 + margin-top: 0; }
77 89  
78 90 .b-cat-title a {
79 91 color: #59a926;
... ...
css/new-style.css.map
  Show/Hide comments   View file @599c309
1 1 {
2 2 "version": 3,
3   -"mappings": "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",
  3 +"mappings": "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",
4 4 "sources": ["new-style.scss"],
5 5 "names": [],
6 6 "file": "new-style.css"
... ...
css/new-style.scss
  Show/Hide comments   View file @599c309
... ... @@ -98,6 +98,23 @@ $greenColor: #59a926;
98 98  
99 99 }
100 100 }
  101 + .fasovka {
  102 + background: none;
  103 + padding: 0;
  104 + label {
  105 + float: left;
  106 + }
  107 + input {
  108 + float: left;
  109 + margin-top: 3px;
  110 + }
  111 + .style {
  112 + margin-top: 5px;
  113 + &:first-child {
  114 + margin-top: 0;
  115 + }
  116 + }
  117 + }
101 118 }
102 119  
103 120  
... ...