Skip to content

Commit 6a01ea9

Browse files
committed
Clean up margin CSS, reorder CSS includes to include tabs.css after Semantic UI (Fix #35)
1 parent 9941970 commit 6a01ea9

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

sphinx_tabs/tabs.css

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
margin-bottom: 2em;
33
}
44

5+
.sphinx-tabs:last-child {
6+
margin-bottom: 1em;
7+
}
8+
59
.sphinx-tabs .sphinx-menu .item p {
610
margin: 0;
711
}
@@ -26,14 +30,7 @@
2630
box-sizing: border-box;
2731
}
2832

29-
.tab div[class^='highlight']:last-child {
30-
margin-bottom: 0;
31-
}
32-
33-
.tab .wy-plain-list-disc:last-child,
34-
.rst-content .section ul:last-child,
35-
.rst-content .toctree-wrapper ul:last-child,
36-
article ul:last-child {
33+
.sphinx-tab.tab.active {
3734
margin-bottom: 0;
3835
}
3936

sphinx_tabs/tabs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414

1515
FILES = [
16-
'tabs.js',
17-
'tabs.css',
1816
'semantic-ui-2.4.1/segment.min.css',
1917
'semantic-ui-2.4.1/menu.min.css',
2018
'semantic-ui-2.4.1/tab.min.css',
2119
'semantic-ui-2.4.1/tab.min.js',
20+
'tabs.js',
21+
'tabs.css'
2222
]
2323

2424

sphinx_tabs/test/testcase.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,18 +114,18 @@ def filter_scripts(x):
114114
self.assertEqual(stylesheets, [
115115
'alabaster.css',
116116
'pygments.css',
117-
'sphinx_tabs/tabs.css',
118117
'sphinx_tabs/semantic-ui-2.4.1/segment.min.css',
119118
'sphinx_tabs/semantic-ui-2.4.1/menu.min.css',
120119
'sphinx_tabs/semantic-ui-2.4.1/tab.min.css',
120+
'sphinx_tabs/tabs.css',
121121
'custom.css'
122122
])
123123
self.assertEqual(scripts, [
124124
'jquery.js',
125125
'underscore.js',
126126
'doctools.js',
127-
'sphinx_tabs/tabs.js',
128-
'sphinx_tabs/semantic-ui-2.4.1/tab.min.js'
127+
'sphinx_tabs/semantic-ui-2.4.1/tab.min.js',
128+
'sphinx_tabs/tabs.js'
129129
])
130130

131131
def assertDoesNotHaveTabsAssets( # pylint: disable=invalid-name

0 commit comments

Comments
 (0)