0001-scss-reduce-specificity-of-navigation-selectors-2444.patch

Frédéric Péters, 19 juin 2018 10:19

Voir les différences: en ligne côte à côte

Subject: [PATCH] scss: reduce specificity of navigation selectors (#24447)

 static/includes/_nav.scss                     | 44 +++++++++----------
 templates/theme.html                          |  6 +--
 .../variants/alfortville/prepare-template.py  |  2 +-
 templates/variants/grandlyon-gnm/theme.html   |  4 +-
 .../variants/grenoble-metropole/theme.html    |  2 +-
 .../combo/page_template_neutre.html           |  2 +-
 .../variants/hautes-alpes-2018/theme.html     |  2 +-
 templates/variants/minint/theme.html          |  2 +-
 templates/variants/montpellier/theme.html     |  4 +-
 9 files changed, 34 insertions(+), 34 deletions(-)

static/includes/_nav.scss
36	36
37	37
38	38	@if $nav-full-width-background == true {
39		div#nav-wrapper {
	39	div.gru-nav-wrapper {
40	40	background: $nav-background;
41	41	color: $nav-color;
42	42	}
43	43	} @else {
44		div#nav {
	44	div.gru-nav {
45	45	background: $nav-background;
46	46	color: $nav-color;
47	47	}
48	48	}
49	49
50		div#nav {
	50	div.gru-nav {
51	51	padding: 0;
52	52	margin: 10px auto;
53	53	height: $nav-height;
54	54	border-radius: $border-radius;
55	55	}
56	56
57		div#nav > ul {
	57	div.gru-nav > ul {
58	58	border-color: $nav-border-color;
59	59	height: $nav-height;
60	60	padding: 0;
...	...
62	62	overflow: hidden;
63	63	}
64	64
65		div#nav > ul > li:first-child > a {
	65	div.gru-nav > ul > li:first-child > a {
66	66	@if $nav-item-selected-mode == background and $nav-full-width-background == false {
67	67	border-radius: $border-radius 0 0 $border-radius;
68	68	}
69	69	}
70	70
71		div#nav > ul > li {
	71	div.gru-nav > ul > li {
72	72	background: $nav-item-background;
73	73	margin: 0;
74	74	margin-right: $nav-item-spacing;
...	...
76	76	padding: 0;
77	77	}
78	78
79		div#nav > ul > li a {
	79	div.gru-nav > ul > li a {
80	80	color: $nav-color;
81	81	font-weight: bold;
82	82	padding: 0px 20px;
...	...
86	86	text-decoration: none;
87	87	}
88	88
89		div#nav li > a {
	89	div.gru-nav li > a {
90	90	@if $nav-item-selected-mode == bottom-border {
91	91	border-bottom: $nav-item-selected-border;
92	92	border-bottom-color: transparent;
93	93	}
94	94	}
95	95
96		div#nav li.selected > a {
	96	div.gru-nav li.selected > a {
97	97	@if $nav-item-selected-mode == background {
98	98	background-color: $nav-item-selected-background;
99	99	color: $nav-item-selected-color;
...	...
104	104	}
105	105	}
106	106
107		div#nav li:hover > a {
	107	div.gru-nav li:hover > a {
108	108	@if $nav-item-selected-mode == background {
109	109	background-color: $nav-item-hover-background;
110	110	color: $nav-item-hover-color;
...	...
116	116
117	117	}
118	118
119		div#nav > ul ul {
	119	div.gru-nav > ul ul {
120	120	display: none;
121	121	position: absolute;
122	122	background: $nav-submenu-background;
...	...
131	131	}
132	132	}
133	133
134		div#nav > ul ul a {
	134	div.gru-nav > ul ul a {
135	135	box-sizing: border-box;
136	136	width: 100%;
137	137	}
138	138
139		div#nav > ul ul li:last-child a {
	139	div.gru-nav > ul ul li:last-child a {
140	140	border-radius: 0 0 $border-radius $border-radius;
141	141	}
142	142
143		div#nav > ul li:hover ul {
	143	div.gru-nav > ul li:hover ul {
144	144	display: block;
145	145	}
146	146
147		#nav-button::-moz-focus-inner {
	147	.gru-nav-button::-moz-focus-inner {
148	148	border: 0;
149	149	}
150	150
151		#nav-button {
	151	.gru-nav-button {
152	152	display: none;
153	153	border-radius: $border-radius $border-radius 0 0;
154	154	cursor: pointer;
155	155	}
156	156
157		div#nav,
	157	div.gru-nav,
158	158	div.menucell {
159	159	span.badge {
160	160	font-size: 80%;
...	...
172	172	}
173	173	}
174	174
175		#nav-wrapper {
	175	.gru-nav-wrapper {
176	176	margin-top: -$nav-menu-side - 10px;
177	177	}
178	178
179		div#nav {
	179	div.gru-nav {
180	180	height: auto;
181	181	background: transparent;
182	182	@if $responsive-menu == left-to-right {
...	...
184	184	}
185	185	}
186	186
187		div#nav ul ul {
	187	div.gru-nav ul ul {
188	188	position: static;
189	189	display: block;
190	190	background: transparent;
...	...
193	193	}
194	194	}
195	195
196		div#nav #nav-button {
	196	div.gru-nav .gru-nav-button {
197	197	display: block;
198	198	z-index: 200;
199	199	position: relative;
...	...
279	279	}
280	280	}
281	281	}
282		div#nav #nav-button.toggled {
	282	div.gru-nav .gru-nav-button.toggled {
283	283	@if $responsive-menu == left-to-right {
284	284	background: transparent;
285	285	}

     {% block nav %}
     <nav>
     <div id="nav-wrapper" >
     <div id="nav" class="togglable">
       <button id="nav-button" class="togglable" aria-label="Menu">
     <div id="nav-wrapper" class="gru-nav-wrapper">
     <div id="nav" class="gru-nav togglable">
       <button id="nav-button" class="gru-nav-button togglable" aria-label="Menu">
         <span class="sr-only">Ouvrir le menu</span>
         <span class="icon-bar icon-bar-1"></span>
         <span class="icon-bar icon-bar-2"></span>

     content = content.replace('<div class="gru-content">',
             '''
     <nav>
     <div id="nav" class="togglable">
     <div id="nav" class="gru-nav togglable">
     {% block menu %}
       <ul>
       </ul>

     {% block nav %}
     <nav class="{% block nav-classes %}{% endblock %}">
     <div id="nav-wrapper" >
     <div id="nav" class="togglable">
     <div id="nav-wrapper" class="gru-nav-wrapper">
     <div id="nav" class="gru-nav togglable">
     {% get_gnm_portal_url as gnm_portal_url %}
     <h1 id="nav-title"><a href="{{gnm_portal_url}}">toodego</a></h1>
     {% block menu %}

     {% block nav %}
     <nav>
     <div id="nav" class="togglable">
     <div id="nav" class="gru-nav togglable">
     {% block menu %}
     {% endblock %}
     </div>

     {% block nav %}
     <nav>
       <div id="nav">
       <div id="nav" class="gru-nav">
       {% block menu %}
       {% show_menu depth=2 %}
       {% placeholder "menu_right" %}

     {% block nav %}
     <nav>
     <div id="nav">
     <div id="nav" class="gru-nav">
     {% block menu %}
     {% endblock %}
     </div>

         <div id="main-content-wrapper">
           <div id="nav" class="togglable" role="navigation">
           <div id="nav" class="gru-nav togglable" role="navigation">
     {% block menu %}
     {% endblock %}
                 </div>

               {% endif %}
             {% endblock %}
             <div id="nav" class="togglable">
                 <button id="nav-button" class="togglable">
             <div id="nav" class="gru-nav togglable">
                 <button id="nav-button" class="gru-nav-button togglable">
         <span class="sr-only">Ouvrir le menu</span>
         <span class="icon-bar icon-bar-1"></span>
         <span class="icon-bar icon-bar-2"></span>
+    -

Projet

Général

Profil

Produits Entr'ouvert » Intégrations graphiques Publik

0001-scss-reduce-specificity-of-navigation-selectors-2444.patch