Skip to content

Commit 168ee61

Browse files
mzimbresmzimbres
authored
Merge pull request #162 from boostorg/develop
Merge latest css improvements into master
2 parents 0380e64 + 723e727 commit 168ee61

23 files changed

+322
-189
lines changed

‎.github/workflows/ci.yml

Lines changed: 103 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -131,25 +131,98 @@ jobs:
131131
fail-fast: false
132132
matrix:
133133
include:
134-
- { toolset: gcc-11, install: g++-11, os: ubuntu-22.04, cxxstd: '17', build-type: 'Debug', ldflags: '' }
135-
- { toolset: gcc-11, install: g++-11, os: ubuntu-22.04, cxxstd: '20', build-type: 'Release', ldflags: '' }
136-
- { toolset: clang-11, install: clang-11, os: ubuntu-22.04, cxxstd: '17', build-type: 'Debug', ldflags: '' }
137-
- { toolset: clang-11, install: clang-11, os: ubuntu-22.04, cxxstd: '20', build-type: 'Debug', ldflags: '' }
138-
- { toolset: clang-13, install: clang-13, os: ubuntu-22.04, cxxstd: '17', build-type: 'Release', ldflags: '' }
139-
- { toolset: clang-13, install: clang-13, os: ubuntu-22.04, cxxstd: '20', build-type: 'Release', ldflags: '' }
140-
- { toolset: clang-14, install: 'clang-14 libc++-14-dev libc++abi-14-dev', os: ubuntu-22.04, cxxstd: '17', build-type: 'Debug', cxxflags: '-stdlib=libc++', ldflags: '-lc++' }
141-
- { toolset: clang-14, install: 'clang-14 libc++-14-dev libc++abi-14-dev', os: ubuntu-22.04, cxxstd: '20', build-type: 'Release', cxxflags: '-stdlib=libc++', ldflags: '-lc++' }
134+
- toolset: gcc-11
135+
install: g++-11
136+
os: ubuntu-latest
137+
container: ubuntu:22.04
138+
cxxstd: '17'
139+
build-type: 'Debug'
140+
ldflags: ''
141+
142+
- toolset: gcc-11
143+
install: g++-11
144+
os: ubuntu-latest
145+
container: ubuntu:22.04
146+
cxxstd: '20'
147+
build-type: 'Release'
148+
ldflags: ''
149+
150+
- toolset: clang-11
151+
install: clang-11
152+
os: ubuntu-latest
153+
container: ubuntu:22.04
154+
cxxstd: '17'
155+
build-type: 'Debug'
156+
ldflags: ''
157+
158+
- toolset: clang-11
159+
install: clang-11
160+
os: ubuntu-latest
161+
container: ubuntu:22.04
162+
cxxstd: '20'
163+
build-type: 'Debug'
164+
ldflags: ''
165+
166+
- toolset: clang-13
167+
install: clang-13
168+
os: ubuntu-latest
169+
container: ubuntu:22.04
170+
cxxstd: '17'
171+
build-type: 'Release'
172+
ldflags: ''
173+
174+
- toolset: clang-13
175+
install: clang-13
176+
os: ubuntu-latest
177+
container: ubuntu:22.04
178+
cxxstd: '20'
179+
build-type: 'Release'
180+
ldflags: ''
181+
182+
- toolset: clang-14
183+
install: 'clang-14 libc++-14-dev libc++abi-14-dev'
184+
os: ubuntu-latest
185+
container: ubuntu:22.04
186+
cxxstd: '17'
187+
build-type: 'Debug'
188+
cxxflags: '-stdlib=libc++'
189+
ldflags: '-lc++'
190+
191+
- toolset: clang-14
192+
install: 'clang-14 libc++-14-dev libc++abi-14-dev'
193+
os: ubuntu-latest
194+
container: ubuntu:22.04
195+
cxxstd: '20'
196+
build-type: 'Release'
197+
cxxflags: '-stdlib=libc++'
198+
ldflags: '-lc++'
199+
142200
runs-on: ${{ matrix.os }}
201+
container: ${{matrix.container}}
143202
env:
144203
CXXFLAGS: ${{matrix.cxxflags}} -Wall -Wextra
145204
LDFLAGS: ${{matrix.ldflags}}
146205
CMAKE_BUILD_PARALLEL_LEVEL: 4
206+
BOOST_REDIS_TEST_SERVER: redis
207+
208+
services:
209+
redis:
210+
image: redis
211+
147212
steps:
148213
- name: Checkout
149214
uses: actions/checkout@v3
150215

216+
- name: Setup container environment
217+
if: matrix.container
218+
run: |
219+
apt-get update
220+
apt-get -y install sudo python3 git g++ libssl-dev protobuf-compiler redis-server
221+
151222
- name: Install dependencies
152-
run: sudo apt-get -y install cmake protobuf-compiler redis-server python3 ${{ matrix.install }}
223+
run: |
224+
sudo apt-get update
225+
sudo apt-get -y install cmake protobuf-compiler redis-server python3 ${{ matrix.install }}
153226
154227
- name: Setup Boost
155228
run: ./tools/ci.py setup-boost --source-dir=$(pwd)
@@ -209,15 +282,32 @@ jobs:
209282
fail-fast: false
210283
matrix:
211284
include:
212-
- { toolset: gcc-11, install: g++-11, cxxstd: "11,17,20" } # Having C++11 shouldn't break the build
213-
- { toolset: clang-14, install: clang-14, cxxstd: "17,20" }
214-
runs-on: ubuntu-22.04
285+
- toolset: gcc-11
286+
install: g++-11
287+
cxxstd: "11,17,20" # Having C++11 shouldn't break the build
288+
os: ubuntu-latest
289+
container: ubuntu:22.04
290+
- toolset: clang-14
291+
install: clang-14
292+
os: ubuntu-latest
293+
container: ubuntu:22.04
294+
cxxstd: "17,20"
295+
runs-on: ${{ matrix.os }}
296+
container: ${{matrix.container}}
215297
steps:
216298
- name: Checkout
217299
uses: actions/checkout@v3
218300

301+
- name: Setup container environment
302+
if: matrix.container
303+
run: |
304+
apt-get update
305+
apt-get -y install sudo python3 git g++ libssl-dev
306+
219307
- name: Install dependencies
220-
run: sudo apt-get -y install python3 ${{ matrix.install }}
308+
run: |
309+
sudo apt-get update
310+
sudo apt-get -y install python3 ${{ matrix.install }}
221311
222312
- name: Setup Boost
223313
run: ./tools/ci.py setup-boost --source-dir=$(pwd)

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ examples and tests cmake is supported, for example
2727

2828
```cpp
2929
# Linux
30-
$ BOOST_ROOT=/opt/boost_1_81_0 cmake --preset g++-11
30+
$ BOOST_ROOT=/opt/boost_1_84_0 cmake --preset g++-11
3131

3232
# Windows
3333
$ cmake -G "Visual Studio 17 2022" -A x64 -B bin64 -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
@@ -676,7 +676,7 @@ https://lists.boost.org/Archives/boost/2023/01/253944.php.
676676

677677
## Changelog
678678

679-
### develop
679+
### Boost 1.84 (First release in Boost)
680680

681681
* Deprecates the `async_receive` overload that takes a response. Users
682682
should now first call `set_receive_response` to avoid constantly and

‎doc/Jamfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ path-constant include_dir : ../include ;
1212
path-constant examples_dir : ../example ;
1313
path-constant readme : ../README.md ;
1414
path-constant layout_file : DoxygenLayout.xml ;
15+
path-constant header : header.html ;
16+
path-constant footer : footer.html ;
1517

1618
local stylesheet_files = [ path.glob $(this_dir) : *.css ] ;
1719
local includes = [ path.glob-tree $(include_dir) : *.hpp *.cpp ] ;
@@ -27,7 +29,7 @@ doxygen doc.html
2729
$(includes) $(examples) $(readme)
2830
:
2931
<doxygen:param>"PROJECT_NAME=Boost.Redis"
30-
<doxygen:param>PROJECT_NUMBER="1.4.2"
32+
<doxygen:param>PROJECT_NUMBER="1.84.0"
3133
<doxygen:param>PROJECT_BRIEF="A redis client library"
3234
<doxygen:param>"STRIP_FROM_PATH=\"$(redis_root_dir)\""
3335
<doxygen:param>"STRIP_FROM_INC_PATH=\"$(include_dir)\""
@@ -46,10 +48,13 @@ doxygen doc.html
4648
<doxygen:param>EXCLUDE_SYMBOLS=std
4749
<doxygen:param>"USE_MDFILE_AS_MAINPAGE=\"$(readme)\""
4850
<doxygen:param>SOURCE_BROWSER=YES
51+
<doxygen:param>"HTML_HEADER=\"$(header)\""
52+
<doxygen:param>"HTML_FOOTER=\"$(footer)\""
4953
<doxygen:param>"HTML_EXTRA_STYLESHEET=$(stylesheet_arg)"
5054
<doxygen:param>HTML_TIMESTAMP=YES
5155
<doxygen:param>GENERATE_TREEVIEW=YES
52-
<doxygen:param>FULL_SIDEBAR=NO
56+
<doxygen:param>FULL_SIDEBAR=YES
57+
<doxygen:param>DISABLE_INDEX=YES
5358
<doxygen:param>ENUM_VALUES_PER_LINE=0
5459
<doxygen:param>OBFUSCATE_EMAILS=YES
5560
<doxygen:param>USE_MATHJAX=YES

‎doc/doxygen-awesome-sidebar-only.css

Lines changed: 74 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -32,84 +32,114 @@ html {
3232
* Make sure it is wide enough to contain the page title (logo + title + version)
3333
*/
3434
--side-nav-fixed-width: 335px;
35-
--menu-display: none;
36-
37-
--top-height: 120px;
38-
--toc-sticky-top: -25px;
39-
--toc-max-height: calc(100vh - 2 * var(--spacing-medium) - 25px);
4035
}
4136

4237
#projectname {
4338
white-space: nowrap;
4439
}
4540

41+
#page-wrapper {
42+
height: calc(100vh - 100px);
43+
display: flex;
44+
flex-direction: column;
45+
}
46+
47+
#content-wrapper {
48+
display: flex;
49+
flex-direction: row;
50+
min-height: 0;
51+
}
52+
53+
#doc-content {
54+
overflow-y: scroll;
55+
flex: 1;
56+
height: auto !important;
57+
}
4658

47-
@media screen and (min-width: 768px) {
59+
@media (min-width: 768px) {
4860
html {
4961
--searchbar-background: var(--page-background-color);
5062
}
5163

52-
#side-nav {
64+
#sidebar-wrapper {
65+
display: flex;
66+
flex-direction: column;
5367
min-width: var(--side-nav-fixed-width);
54-
max-width: var(--side-nav-fixed-width);
55-
top: var(--top-height);
56-
overflow: visible;
68+
max-width: var(--side-nav-fixed-width);
69+
background-color: var(--side-nav-background);
70+
border-right: 1px solid rgb(222, 222, 222);
5771
}
5872

59-
#nav-tree, #side-nav {
60-
height: calc(100vh - var(--top-height)) !important;
73+
#search-box-wrapper {
74+
display: flex;
75+
flex-direction: row;
76+
padding-left: 1em;
77+
padding-right: 1em;
6178
}
6279

63-
#nav-tree {
64-
padding: 0;
80+
#MSearchBox {
81+
flex: 1;
82+
display: flex;
83+
padding-left: 1em;
84+
padding-right: 1em;
6585
}
6686

67-
#top {
68-
display: block;
69-
border-bottom: none;
70-
height: var(--top-height);
71-
margin-bottom: calc(0px - var(--top-height));
72-
max-width: var(--side-nav-fixed-width);
73-
overflow: hidden;
74-
background: var(--side-nav-background);
87+
88+
#MSearchBox .left {
89+
display: flex;
90+
flex: 1;
91+
position: static;
92+
align-items: center;
93+
justify-content: flex-start;
94+
width: auto;
95+
height: auto;
7596
}
76-
#main-nav {
77-
float: left;
78-
padding-right: 0;
97+
98+
#MSearchBox .right {
99+
display: none;
79100
}
80101

81-
.ui-resizable-handle {
82-
cursor: default;
83-
width: 1px !important;
84-
box-shadow: 0 calc(-2 * var(--top-height)) 0 0 var(--separator-color);
102+
#MSearchSelect {
103+
padding-left: 0.75em;
104+
left: auto;
105+
background-repeat: no-repeat;
85106
}
86107

87-
#nav-path {
88-
position: fixed;
89-
right: 0;
90-
left: var(--side-nav-fixed-width);
91-
bottom: 0;
108+
#MSearchField {
109+
flex: 1;
110+
position: static;
92111
width: auto;
112+
height: auto;
93113
}
94114

95-
#doc-content {
96-
height: calc(100vh - 31px) !important;
97-
padding-bottom: calc(3 * var(--spacing-large));
98-
padding-top: calc(var(--top-height) - 80px);
99-
box-sizing: border-box;
100-
margin-left: var(--side-nav-fixed-width) !important;
115+
#nav-tree {
116+
height: auto !important;
101117
}
102118

103-
#MSearchBox {
104-
width: calc(var(--side-nav-fixed-width) - calc(2 * var(--spacing-medium)));
119+
#nav-sync {
120+
display: none;
105121
}
106122

107-
#MSearchField {
108-
width: calc(var(--side-nav-fixed-width) - calc(2 * var(--spacing-medium)) - 65px);
123+
#top {
124+
display: block;
125+
border-bottom: none;
126+
max-width: var(--side-nav-fixed-width);
127+
background: var(--side-nav-background);
128+
}
129+
130+
.ui-resizable-handle {
131+
cursor: default;
132+
width: 1px !important;
109133
}
110134

111135
#MSearchResultsWindow {
112136
left: var(--spacing-medium) !important;
113137
right: auto;
114138
}
115139
}
140+
141+
@media (max-width: 768px) {
142+
#sidebar-wrapper {
143+
display: none;
144+
}
145+
}

‎doc/doxygen-awesome.css

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -552,25 +552,6 @@ a.anchor {
552552
margin-top: 0;
553553
}
554554

555-
/* until Doxygen 1.9.4 */
556-
.left img#MSearchSelect {
557-
left: 0;
558-
user-select: none;
559-
padding-left: 8px;
560-
}
561-
562-
/* Doxygen 1.9.5 */
563-
.left span#MSearchSelect {
564-
left: 0;
565-
user-select: none;
566-
margin-left: 8px;
567-
padding: 0;
568-
}
569-
570-
.left #MSearchSelect[src$=".png"] {
571-
padding-left: 0
572-
}
573-
574555
.SelectionMark {
575556
user-select: none;
576557
}
@@ -614,9 +595,7 @@ a.anchor {
614595

615596
#MSearchField {
616597
font-size: var(--navigation-font-size);
617-
height: calc(var(--searchbar-height) - 2px);
618598
background: transparent;
619-
width: calc(var(--searchbar-width) - 64px);
620599
}
621600

622601
.MSearchBoxActive #MSearchField {

0 commit comments

Comments
 (0)