Browse Source

Update selectors laouyt

pull/2474/head
Artur Arseniev 7 years ago
parent
commit
42b8922434
  1. 2
      dist/css/grapes.min.css
  2. 6
      src/selector_manager/view/ClassTagsView.js
  3. 16
      src/styles/scss/_gjs_selectors.scss
  4. 2
      test/specs/selector_manager/view/ClassTagsView.js

2
dist/css/grapes.min.css

File diff suppressed because one or more lines are too long

6
src/selector_manager/view/ClassTagsView.js

@ -13,9 +13,9 @@ export default Backbone.View.extend({
ppfx ppfx
}) { }) {
return ` return `
<div id="${pfx}up"> <div id="${pfx}up" class="${pfx}header">
<div id="${pfx}label">${labelHead}</div> <div id="${pfx}label" class="${pfx}header-label">${labelHead}</div>
<div id="${pfx}status-c"> <div id="${pfx}status-c" class="${pfx}header-status">
<span id="${pfx}input-c" data-states-c> <span id="${pfx}input-c" data-states-c>
<div class="${ppfx}field ${ppfx}select"> <div class="${ppfx}field ${ppfx}select">
<span id="${ppfx}input-holder"> <span id="${ppfx}input-holder">

16
src/styles/scss/_gjs_selectors.scss

@ -25,6 +25,17 @@
display: block; display: block;
} }
&header {
display: flex;
align-items: center;
margin: 7px 0;
&-status {
flex-shrink: 1;
margin-left: auto;
}
}
&tag { &tag {
display: flex; display: flex;
overflow: hidden; overflow: hidden;
@ -67,7 +78,6 @@
font-size: $fontSizeS; font-size: $fontSizeS;
padding: 10px 5px; padding: 10px 5px;
##{$clm-prefix}label,
##{$clm-prefix}sel { ##{$clm-prefix}sel {
padding: 7px 0; padding: 7px 0;
float: left; float: left;
@ -78,10 +88,6 @@
margin-left: 5px; margin-left: 5px;
} }
##{$clm-prefix}status-c {
float: right;
}
##{$clm-prefix}tags-field { ##{$clm-prefix}tags-field {
clear: both; clear: both;
padding: 5px; padding: 5px;

2
test/specs/selector_manager/view/ClassTagsView.js

@ -250,7 +250,7 @@ describe('ClassTagsView', () => {
}); });
}); });
describe.only('updateSelection', () => { describe('updateSelection', () => {
test('Returns empty array without targets', () => { test('Returns empty array without targets', () => {
expect(view.updateSelection([])).toEqual([]); expect(view.updateSelection([])).toEqual([]);
}); });

Loading…
Cancel
Save