system-clients 3.2.1 → 3.2.2-aodeToV4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (158) hide show
  1. package/.eslintrc.js +16 -16
  2. package/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock +0 -0
  3. package/.gradle/7.1/executionHistory/executionHistory.bin +0 -0
  4. package/.gradle/7.1/executionHistory/executionHistory.lock +0 -0
  5. package/.gradle/7.1/fileChanges/last-build.bin +0 -0
  6. package/.gradle/7.1/fileHashes/fileHashes.bin +0 -0
  7. package/.gradle/7.1/fileHashes/fileHashes.lock +0 -0
  8. package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  9. package/.gradle/buildOutputCleanup/cache.properties +2 -2
  10. package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
  11. package/.gradle/checksums/checksums.lock +0 -0
  12. package/SystemClient.iml +11 -11
  13. package/build/webpack.base.conf.js +78 -75
  14. package/build.gradle +6 -6
  15. package/gradle/wrapper/gradle-wrapper.jar +0 -0
  16. package/gradle/wrapper/gradle-wrapper.properties +5 -0
  17. package/gradlew +185 -0
  18. package/gradlew.bat +89 -0
  19. package/index.html +21 -21
  20. package/package.json +2 -2
  21. package/src/App.vue +1 -1
  22. package/src/LodopFuncs.js +123 -123
  23. package/src/components/Main.vue +46 -152
  24. package/src/components/Util.js +343 -343
  25. package/src/components/equipment/EquipmentManage.vue +65 -65
  26. package/src/components/equipment/PcAdd.vue +105 -105
  27. package/src/components/equipment/PcList.vue +119 -119
  28. package/src/components/equipment/PcManage.vue +60 -60
  29. package/src/components/equipment/PhoneAdd.vue +94 -94
  30. package/src/components/equipment/PhoneList.vue +102 -102
  31. package/src/components/equipment/PhoneManage.vue +60 -60
  32. package/src/components/equipment/PosAdd.vue +156 -137
  33. package/src/components/equipment/PosList.vue +164 -164
  34. package/src/components/equipment/PosManage.vue +68 -67
  35. package/src/components/materialManage/materialData.vue +44 -44
  36. package/src/components/materialManage/materialList.vue +255 -255
  37. package/src/components/parammanage/ParamManage.vue +42 -42
  38. package/src/components/parammanage/ParamPage.vue +314 -314
  39. package/src/components/parammanage/ParamPages.vue +222 -222
  40. package/src/components/parammanage/SinglePage.vue +235 -235
  41. package/src/components/parammanage/SinglePages.vue +167 -167
  42. package/src/components/server/AddChangeMsg.vue +66 -66
  43. package/src/components/server/ChangeDeclare.vue +45 -45
  44. package/src/components/server/LeftTree.vue +111 -111
  45. package/src/components/server/LoadData.vue +36 -36
  46. package/src/components/server/Login.vue +726 -624
  47. package/src/components/server/Menu.vue +188 -188
  48. package/src/components/server/ModifyPw.vue +112 -106
  49. package/src/components/server/NewResSelectGroup.vue +211 -0
  50. package/src/components/server/ResSelect.vue +153 -150
  51. package/src/components/server/ResSelectGroup.vue +159 -142
  52. package/src/components/server/RightTree.vue +343 -263
  53. package/src/components/server/RoleSelector.vue +90 -89
  54. package/src/components/server/TestResSelect.vue +58 -58
  55. package/src/components/server/TestResSelectGroup.vue +388 -388
  56. package/src/plugins/EncryptUtil.js +53 -0
  57. package/src/plugins/GetLoginInfoService.js +88 -104
  58. package/src/plugins/HeatGetLoginInfoService.js +491 -0
  59. package/src/plugins/validation.js +7 -7
  60. package/src/project/State.js +1 -1
  61. package/src/stores/AppData.js +38 -38
  62. package/src/stores/HeatAppData.js +38 -0
  63. package/src/styles/fonts/glyphicons-halflings-regular.svg +287 -287
  64. package/src/styles/less/.csscomb.json +304 -304
  65. package/src/styles/less/.csslintrc +19 -19
  66. package/src/styles/less/alerts.less +73 -73
  67. package/src/styles/less/aofeng/animate.min.css +10 -10
  68. package/src/styles/less/aofeng/expandcss.less +569 -569
  69. package/src/styles/less/aofeng/standard.less +2121 -2121
  70. package/src/styles/less/aofeng/themeOne/BinaryTemplate.less +686 -686
  71. package/src/styles/less/aofeng/themeOne/loginStyle.less +1586 -1586
  72. package/src/styles/less/aofeng/themeOne/systemStyle.less +2650 -2650
  73. package/src/styles/less/aofeng/themeOne.less +17 -14
  74. package/src/styles/less/aofeng/themeTwo/newStyle1.less +415 -415
  75. package/src/styles/less/aofeng/themeTwo.less +3 -3
  76. package/src/styles/less/badges.less +66 -66
  77. package/src/styles/less/bootstrap.less +66 -66
  78. package/src/styles/less/breadcrumbs.less +26 -26
  79. package/src/styles/less/button-groups.less +247 -247
  80. package/src/styles/less/buttons.less +172 -172
  81. package/src/styles/less/carousel.less +269 -269
  82. package/src/styles/less/close.less +34 -34
  83. package/src/styles/less/code.less +69 -69
  84. package/src/styles/less/component-animations.less +33 -33
  85. package/src/styles/less/dropdowns.less +216 -216
  86. package/src/styles/less/fonts-list.less +25 -25
  87. package/src/styles/less/forms.less +626 -626
  88. package/src/styles/less/glyphicons.less +305 -305
  89. package/src/styles/less/grid.less +84 -84
  90. package/src/styles/less/input-groups.less +167 -167
  91. package/src/styles/less/jumbotron.less +52 -52
  92. package/src/styles/less/labels.less +64 -64
  93. package/src/styles/less/list-group.less +141 -141
  94. package/src/styles/less/manageStyle/manageChile.less +180 -180
  95. package/src/styles/less/manageStyle/manageStyle.less +1102 -1102
  96. package/src/styles/less/manageStyle/safeStyle.less +498 -498
  97. package/src/styles/less/media.less +66 -66
  98. package/src/styles/less/mixins/alerts.less +14 -14
  99. package/src/styles/less/mixins/background-variant.less +9 -9
  100. package/src/styles/less/mixins/border-radius.less +18 -18
  101. package/src/styles/less/mixins/buttons.less +69 -69
  102. package/src/styles/less/mixins/center-block.less +7 -7
  103. package/src/styles/less/mixins/clearfix.less +22 -22
  104. package/src/styles/less/mixins/forms.less +90 -90
  105. package/src/styles/less/mixins/gradients.less +59 -59
  106. package/src/styles/less/mixins/grid-framework.less +92 -92
  107. package/src/styles/less/mixins/grid.less +122 -122
  108. package/src/styles/less/mixins/hide-text.less +21 -21
  109. package/src/styles/less/mixins/image.less +33 -33
  110. package/src/styles/less/mixins/labels.less +12 -12
  111. package/src/styles/less/mixins/list-group.less +30 -30
  112. package/src/styles/less/mixins/nav-divider.less +10 -10
  113. package/src/styles/less/mixins/nav-vertical-align.less +9 -9
  114. package/src/styles/less/mixins/opacity.less +8 -8
  115. package/src/styles/less/mixins/pagination.less +24 -24
  116. package/src/styles/less/mixins/panels.less +24 -24
  117. package/src/styles/less/mixins/progress-bar.less +10 -10
  118. package/src/styles/less/mixins/reset-filter.less +8 -8
  119. package/src/styles/less/mixins/reset-text.less +18 -18
  120. package/src/styles/less/mixins/resize.less +6 -6
  121. package/src/styles/less/mixins/responsive-visibility.less +15 -15
  122. package/src/styles/less/mixins/size.less +10 -10
  123. package/src/styles/less/mixins/tab-focus.less +9 -9
  124. package/src/styles/less/mixins/table-row.less +44 -44
  125. package/src/styles/less/mixins/text-emphasis.less +9 -9
  126. package/src/styles/less/mixins/text-overflow.less +8 -8
  127. package/src/styles/less/mixins/vendor-prefixes.less +227 -227
  128. package/src/styles/less/mixins.less +40 -40
  129. package/src/styles/less/modals.less +151 -151
  130. package/src/styles/less/navbar.less +660 -660
  131. package/src/styles/less/navs.less +285 -285
  132. package/src/styles/less/normalize.less +424 -424
  133. package/src/styles/less/pager.less +76 -76
  134. package/src/styles/less/pagination.less +89 -89
  135. package/src/styles/less/panels.less +275 -275
  136. package/src/styles/less/popovers.less +131 -131
  137. package/src/styles/less/print.less +101 -101
  138. package/src/styles/less/progress-bars.less +87 -87
  139. package/src/styles/less/responsive-embed.less +35 -35
  140. package/src/styles/less/responsive-utilities.less +194 -194
  141. package/src/styles/less/scaffolding.less +161 -161
  142. package/src/styles/less/stand.less +207 -207
  143. package/src/styles/less/tables.less +262 -262
  144. package/src/styles/less/theme.less +291 -291
  145. package/src/styles/less/thumbnails.less +36 -36
  146. package/src/styles/less/tooltip.less +102 -102
  147. package/src/styles/less/type.less +303 -303
  148. package/src/styles/less/utilities.less +55 -55
  149. package/src/styles/less/variables.less +896 -896
  150. package/src/styles/less/wells.less +29 -29
  151. package/src/system.js +85 -76
  152. package/static/aodelogo.png +0 -0
  153. package/static/aodenewlogo.png +0 -0
  154. package/static/ewmlogo.png +0 -0
  155. package/.gradle/buildOutputCleanup/cache.properties.lock +0 -1
  156. package/static/logo.png +0 -0
  157. /package/.gradle/{5.2.1 → 7.1/dependencies-accessors}/gc.properties +0 -0
  158. /package/.gradle/{buildOutputCleanup/built.bin → 7.1/gc.properties} +0 -0
@@ -1,84 +1,84 @@
1
- //
2
- // Grid system
3
- // --------------------------------------------------
4
-
5
-
6
- // Container widths
7
- //
8
- // Set the container width, and override it for fixed navbars in media queries.
9
-
10
- .container {
11
- .container-fixed();
12
-
13
- @media (min-width: @screen-sm-min) {
14
- width: @container-sm;
15
- }
16
- @media (min-width: @screen-md-min) {
17
- width: @container-md;
18
- }
19
- @media (min-width: @screen-lg-min) {
20
- width: @container-lg;
21
- }
22
- }
23
-
24
-
25
- // Fluid container
26
- //
27
- // Utilizes the mixin meant for fixed width containers, but without any defined
28
- // width for fluid, full width layouts.
29
-
30
- .container-fluid {
31
- .container-fixed();
32
- }
33
-
34
-
35
- // Row
36
- //
37
- // Rows contain and clear the floats of your columns.
38
-
39
- .row {
40
- .make-row();
41
- }
42
-
43
-
44
- // Columns
45
- //
46
- // Common styles for small and large grid columns
47
-
48
- .make-grid-columns();
49
-
50
-
51
- // Extra small grid
52
- //
53
- // Columns, offsets, pushes, and pulls for extra small devices like
54
- // smartphones.
55
-
56
- .make-grid(xs);
57
-
58
-
59
- // Small grid
60
- //
61
- // Columns, offsets, pushes, and pulls for the small device range, from phones
62
- // to tablets.
63
-
64
- @media (min-width: @screen-sm-min) {
65
- .make-grid(sm);
66
- }
67
-
68
-
69
- // Medium grid
70
- //
71
- // Columns, offsets, pushes, and pulls for the desktop device range.
72
-
73
- @media (min-width: @screen-md-min) {
74
- .make-grid(md);
75
- }
76
-
77
-
78
- // Large grid
79
- //
80
- // Columns, offsets, pushes, and pulls for the large desktop device range.
81
-
82
- @media (min-width: @screen-lg-min) {
83
- .make-grid(lg);
84
- }
1
+ //
2
+ // Grid system
3
+ // --------------------------------------------------
4
+
5
+
6
+ // Container widths
7
+ //
8
+ // Set the container width, and override it for fixed navbars in media queries.
9
+
10
+ .container {
11
+ .container-fixed();
12
+
13
+ @media (min-width: @screen-sm-min) {
14
+ width: @container-sm;
15
+ }
16
+ @media (min-width: @screen-md-min) {
17
+ width: @container-md;
18
+ }
19
+ @media (min-width: @screen-lg-min) {
20
+ width: @container-lg;
21
+ }
22
+ }
23
+
24
+
25
+ // Fluid container
26
+ //
27
+ // Utilizes the mixin meant for fixed width containers, but without any defined
28
+ // width for fluid, full width layouts.
29
+
30
+ .container-fluid {
31
+ .container-fixed();
32
+ }
33
+
34
+
35
+ // Row
36
+ //
37
+ // Rows contain and clear the floats of your columns.
38
+
39
+ .row {
40
+ .make-row();
41
+ }
42
+
43
+
44
+ // Columns
45
+ //
46
+ // Common styles for small and large grid columns
47
+
48
+ .make-grid-columns();
49
+
50
+
51
+ // Extra small grid
52
+ //
53
+ // Columns, offsets, pushes, and pulls for extra small devices like
54
+ // smartphones.
55
+
56
+ .make-grid(xs);
57
+
58
+
59
+ // Small grid
60
+ //
61
+ // Columns, offsets, pushes, and pulls for the small device range, from phones
62
+ // to tablets.
63
+
64
+ @media (min-width: @screen-sm-min) {
65
+ .make-grid(sm);
66
+ }
67
+
68
+
69
+ // Medium grid
70
+ //
71
+ // Columns, offsets, pushes, and pulls for the desktop device range.
72
+
73
+ @media (min-width: @screen-md-min) {
74
+ .make-grid(md);
75
+ }
76
+
77
+
78
+ // Large grid
79
+ //
80
+ // Columns, offsets, pushes, and pulls for the large desktop device range.
81
+
82
+ @media (min-width: @screen-lg-min) {
83
+ .make-grid(lg);
84
+ }
@@ -1,167 +1,167 @@
1
- //
2
- // Input groups
3
- // --------------------------------------------------
4
-
5
- // Base styles
6
- // -------------------------
7
- .input-group {
8
- position: relative; // For dropdowns
9
- display: table;
10
- border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table
11
-
12
- // Undo padding and float of grid classes
13
- &[class*="col-"] {
14
- float: none;
15
- padding-left: 0;
16
- padding-right: 0;
17
- }
18
-
19
- .form-control {
20
- // Ensure that the input is always above the *appended* addon button for
21
- // proper border colors.
22
- position: relative;
23
- z-index: 2;
24
-
25
- // IE9 fubars the placeholder attribute in text inputs and the arrows on
26
- // select elements in input groups. To fix it, we float the input. Details:
27
- // https://github.com/twbs/bootstrap/issues/11561#issuecomment-28936855
28
- float: left;
29
-
30
- width: 100%;
31
- margin-bottom: 0;
32
- }
33
- }
34
-
35
- // Sizing options
36
- //
37
- // Remix the default form control sizing classes into new ones for easier
38
- // manipulation.
39
-
40
- .input-group-lg > .form-control,
41
- .input-group-lg > .input-group-addon,
42
- .input-group-lg > .input-group-btn > .btn {
43
- .input-lg();
44
- }
45
- .input-group-sm > .form-control,
46
- .input-group-sm > .input-group-addon,
47
- .input-group-sm > .input-group-btn > .btn {
48
- .input-sm();
49
- }
50
-
51
-
52
- // Display as table-cell
53
- // -------------------------
54
- .input-group-addon,
55
- .input-group-btn,
56
- .input-group .form-control {
57
- display: table-cell;
58
-
59
- &:not(:first-child):not(:last-child) {
60
- border-radius: 0;
61
- }
62
- }
63
- // Addon and addon wrapper for buttons
64
- .input-group-addon,
65
- .input-group-btn {
66
- width: 1%;
67
- white-space: nowrap;
68
- vertical-align: middle; // Match the inputs
69
- }
70
-
71
- // Text input groups
72
- // -------------------------
73
- .input-group-addon {
74
- padding: @padding-base-vertical @padding-base-horizontal;
75
- font-size: @font-size-base;
76
- font-weight: normal;
77
- line-height: 1;
78
- color: @input-color;
79
- text-align: center;
80
- background-color: @input-group-addon-bg;
81
- border: 1px solid @input-group-addon-border-color;
82
- border-radius: @border-radius-base;
83
-
84
- // Sizing
85
- &.input-sm {
86
- padding: @padding-small-vertical @padding-small-horizontal;
87
- font-size: @font-size-small;
88
- border-radius: @border-radius-small;
89
- }
90
- &.input-lg {
91
- padding: @padding-large-vertical @padding-large-horizontal;
92
- font-size: @font-size-large;
93
- border-radius: @border-radius-large;
94
- }
95
-
96
- // Nuke default margins from checkboxes and radios to vertically center within.
97
- input[type="radio"],
98
- input[type="checkbox"] {
99
- margin-top: 0;
100
- }
101
- }
102
-
103
- // Reset rounded corners
104
- .input-group .form-control:first-child,
105
- .input-group-addon:first-child,
106
- .input-group-btn:first-child > .btn,
107
- .input-group-btn:first-child > .btn-group > .btn,
108
- .input-group-btn:first-child > .dropdown-toggle,
109
- .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
110
- .input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
111
- .border-right-radius(0);
112
- }
113
- .input-group-addon:first-child {
114
- border-right: 0;
115
- }
116
- .input-group .form-control:last-child,
117
- .input-group-addon:last-child,
118
- .input-group-btn:last-child > .btn,
119
- .input-group-btn:last-child > .btn-group > .btn,
120
- .input-group-btn:last-child > .dropdown-toggle,
121
- .input-group-btn:first-child > .btn:not(:first-child),
122
- .input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
123
- .border-left-radius(0);
124
- }
125
- .input-group-addon:last-child {
126
- border-left: 0;
127
- }
128
-
129
- // Button input groups
130
- // -------------------------
131
- .input-group-btn {
132
- position: relative;
133
- // Jankily prevent input button groups from wrapping with `white-space` and
134
- // `font-size` in combination with `inline-block` on buttons.
135
- font-size: 0;
136
- white-space: nowrap;
137
-
138
- // Negative margin for spacing, position for bringing hovered/focused/actived
139
- // element above the siblings.
140
- > .btn {
141
- position: relative;
142
- + .btn {
143
- margin-left: -1px;
144
- }
145
- // Bring the "active" button to the front
146
- &:hover,
147
- &:focus,
148
- &:active {
149
- z-index: 2;
150
- }
151
- }
152
-
153
- // Negative margin to only have a 1px border between the two
154
- &:first-child {
155
- > .btn,
156
- > .btn-group {
157
- margin-right: -1px;
158
- }
159
- }
160
- &:last-child {
161
- > .btn,
162
- > .btn-group {
163
- z-index: 2;
164
- margin-left: -1px;
165
- }
166
- }
167
- }
1
+ //
2
+ // Input groups
3
+ // --------------------------------------------------
4
+
5
+ // Base styles
6
+ // -------------------------
7
+ .input-group {
8
+ position: relative; // For dropdowns
9
+ display: table;
10
+ border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table
11
+
12
+ // Undo padding and float of grid classes
13
+ &[class*="col-"] {
14
+ float: none;
15
+ padding-left: 0;
16
+ padding-right: 0;
17
+ }
18
+
19
+ .form-control {
20
+ // Ensure that the input is always above the *appended* addon button for
21
+ // proper border colors.
22
+ position: relative;
23
+ z-index: 2;
24
+
25
+ // IE9 fubars the placeholder attribute in text inputs and the arrows on
26
+ // select elements in input groups. To fix it, we float the input. Details:
27
+ // https://github.com/twbs/bootstrap/issues/11561#issuecomment-28936855
28
+ float: left;
29
+
30
+ width: 100%;
31
+ margin-bottom: 0;
32
+ }
33
+ }
34
+
35
+ // Sizing options
36
+ //
37
+ // Remix the default form control sizing classes into new ones for easier
38
+ // manipulation.
39
+
40
+ .input-group-lg > .form-control,
41
+ .input-group-lg > .input-group-addon,
42
+ .input-group-lg > .input-group-btn > .btn {
43
+ .input-lg();
44
+ }
45
+ .input-group-sm > .form-control,
46
+ .input-group-sm > .input-group-addon,
47
+ .input-group-sm > .input-group-btn > .btn {
48
+ .input-sm();
49
+ }
50
+
51
+
52
+ // Display as table-cell
53
+ // -------------------------
54
+ .input-group-addon,
55
+ .input-group-btn,
56
+ .input-group .form-control {
57
+ display: table-cell;
58
+
59
+ &:not(:first-child):not(:last-child) {
60
+ border-radius: 0;
61
+ }
62
+ }
63
+ // Addon and addon wrapper for buttons
64
+ .input-group-addon,
65
+ .input-group-btn {
66
+ width: 1%;
67
+ white-space: nowrap;
68
+ vertical-align: middle; // Match the inputs
69
+ }
70
+
71
+ // Text input groups
72
+ // -------------------------
73
+ .input-group-addon {
74
+ padding: @padding-base-vertical @padding-base-horizontal;
75
+ font-size: @font-size-base;
76
+ font-weight: normal;
77
+ line-height: 1;
78
+ color: @input-color;
79
+ text-align: center;
80
+ background-color: @input-group-addon-bg;
81
+ border: 1px solid @input-group-addon-border-color;
82
+ border-radius: @border-radius-base;
83
+
84
+ // Sizing
85
+ &.input-sm {
86
+ padding: @padding-small-vertical @padding-small-horizontal;
87
+ font-size: @font-size-small;
88
+ border-radius: @border-radius-small;
89
+ }
90
+ &.input-lg {
91
+ padding: @padding-large-vertical @padding-large-horizontal;
92
+ font-size: @font-size-large;
93
+ border-radius: @border-radius-large;
94
+ }
95
+
96
+ // Nuke default margins from checkboxes and radios to vertically center within.
97
+ input[type="radio"],
98
+ input[type="checkbox"] {
99
+ margin-top: 0;
100
+ }
101
+ }
102
+
103
+ // Reset rounded corners
104
+ .input-group .form-control:first-child,
105
+ .input-group-addon:first-child,
106
+ .input-group-btn:first-child > .btn,
107
+ .input-group-btn:first-child > .btn-group > .btn,
108
+ .input-group-btn:first-child > .dropdown-toggle,
109
+ .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
110
+ .input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
111
+ .border-right-radius(0);
112
+ }
113
+ .input-group-addon:first-child {
114
+ border-right: 0;
115
+ }
116
+ .input-group .form-control:last-child,
117
+ .input-group-addon:last-child,
118
+ .input-group-btn:last-child > .btn,
119
+ .input-group-btn:last-child > .btn-group > .btn,
120
+ .input-group-btn:last-child > .dropdown-toggle,
121
+ .input-group-btn:first-child > .btn:not(:first-child),
122
+ .input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
123
+ .border-left-radius(0);
124
+ }
125
+ .input-group-addon:last-child {
126
+ border-left: 0;
127
+ }
128
+
129
+ // Button input groups
130
+ // -------------------------
131
+ .input-group-btn {
132
+ position: relative;
133
+ // Jankily prevent input button groups from wrapping with `white-space` and
134
+ // `font-size` in combination with `inline-block` on buttons.
135
+ font-size: 0;
136
+ white-space: nowrap;
137
+
138
+ // Negative margin for spacing, position for bringing hovered/focused/actived
139
+ // element above the siblings.
140
+ > .btn {
141
+ position: relative;
142
+ + .btn {
143
+ margin-left: -1px;
144
+ }
145
+ // Bring the "active" button to the front
146
+ &:hover,
147
+ &:focus,
148
+ &:active {
149
+ z-index: 2;
150
+ }
151
+ }
152
+
153
+ // Negative margin to only have a 1px border between the two
154
+ &:first-child {
155
+ > .btn,
156
+ > .btn-group {
157
+ margin-right: -1px;
158
+ }
159
+ }
160
+ &:last-child {
161
+ > .btn,
162
+ > .btn-group {
163
+ z-index: 2;
164
+ margin-left: -1px;
165
+ }
166
+ }
167
+ }
@@ -1,52 +1,52 @@
1
- //
2
- // Jumbotron
3
- // --------------------------------------------------
4
-
5
-
6
- .jumbotron {
7
- padding-top: @jumbotron-padding;
8
- padding-bottom: @jumbotron-padding;
9
- margin-bottom: @jumbotron-padding;
10
- color: @jumbotron-color;
11
- background-color: @jumbotron-bg;
12
-
13
- h1,
14
- .h1 {
15
- color: @jumbotron-heading-color;
16
- }
17
-
18
- p {
19
- margin-bottom: (@jumbotron-padding / 2);
20
- font-size: @jumbotron-font-size;
21
- font-weight: 200;
22
- }
23
-
24
- > hr {
25
- border-top-color: darken(@jumbotron-bg, 10%);
26
- }
27
-
28
- .container &,
29
- .container-fluid & {
30
- border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
31
- }
32
-
33
- .container {
34
- max-width: 100%;
35
- }
36
-
37
- @media screen and (min-width: @screen-sm-min) {
38
- padding-top: (@jumbotron-padding * 1.6);
39
- padding-bottom: (@jumbotron-padding * 1.6);
40
-
41
- .container &,
42
- .container-fluid & {
43
- padding-left: (@jumbotron-padding * 2);
44
- padding-right: (@jumbotron-padding * 2);
45
- }
46
-
47
- h1,
48
- .h1 {
49
- font-size: @jumbotron-heading-font-size;
50
- }
51
- }
52
- }
1
+ //
2
+ // Jumbotron
3
+ // --------------------------------------------------
4
+
5
+
6
+ .jumbotron {
7
+ padding-top: @jumbotron-padding;
8
+ padding-bottom: @jumbotron-padding;
9
+ margin-bottom: @jumbotron-padding;
10
+ color: @jumbotron-color;
11
+ background-color: @jumbotron-bg;
12
+
13
+ h1,
14
+ .h1 {
15
+ color: @jumbotron-heading-color;
16
+ }
17
+
18
+ p {
19
+ margin-bottom: (@jumbotron-padding / 2);
20
+ font-size: @jumbotron-font-size;
21
+ font-weight: 200;
22
+ }
23
+
24
+ > hr {
25
+ border-top-color: darken(@jumbotron-bg, 10%);
26
+ }
27
+
28
+ .container &,
29
+ .container-fluid & {
30
+ border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
31
+ }
32
+
33
+ .container {
34
+ max-width: 100%;
35
+ }
36
+
37
+ @media screen and (min-width: @screen-sm-min) {
38
+ padding-top: (@jumbotron-padding * 1.6);
39
+ padding-bottom: (@jumbotron-padding * 1.6);
40
+
41
+ .container &,
42
+ .container-fluid & {
43
+ padding-left: (@jumbotron-padding * 2);
44
+ padding-right: (@jumbotron-padding * 2);
45
+ }
46
+
47
+ h1,
48
+ .h1 {
49
+ font-size: @jumbotron-heading-font-size;
50
+ }
51
+ }
52
+ }