mirror of
https://github.com/jgthms/bulma.git
synced 2025-01-09 15:44:25 +00:00
Update expo
This commit is contained in:
Jeremy Thomas
parent
4393cb512b
commit
cdbf94aa8f
@ -8426,6 +8426,7 @@ label.panel-block:hover {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
box-shadow: 0 1px 0 rgba(219, 219, 219, 0.3);
|
||||
>>>>>>> Use link instead of primary
|
||||
@ -8445,6 +8446,11 @@ label.panel-block:hover {
|
||||
>>>>>>> Add love data
|
||||
=======
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
=======
|
||||
box-shadow: 0 1px 0 rgba(219, 219, 219, 0.3);
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
}
|
||||
|
||||
.hero .tabs ul {
|
||||
@ -8476,6 +8482,9 @@ label.panel-block:hover {
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-white .navbar-menu {
|
||||
=======
|
||||
@ -8485,11 +8494,15 @@ label.panel-block:hover {
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
.hero.is-white .nav-menu {
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-white .navbar-menu {
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
background-color: white;
|
||||
}
|
||||
}
|
||||
@ -8568,6 +8581,9 @@ label.panel-block:hover {
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-black .navbar-menu {
|
||||
=======
|
||||
@ -8577,11 +8593,15 @@ label.panel-block:hover {
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
.hero.is-black .nav-menu {
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-black .navbar-menu {
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
background-color: #0a0a0a;
|
||||
}
|
||||
}
|
||||
@ -8660,6 +8680,9 @@ label.panel-block:hover {
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-light .navbar-menu {
|
||||
=======
|
||||
@ -8669,11 +8692,15 @@ label.panel-block:hover {
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
.hero.is-light .nav-menu {
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-light .navbar-menu {
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
background-color: whitesmoke;
|
||||
}
|
||||
}
|
||||
@ -8750,6 +8777,7 @@ label.panel-block:hover {
|
||||
color: whitesmoke;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
@media screen and (max-width: 1023px) {
|
||||
@ -8766,6 +8794,18 @@ label.panel-block:hover {
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-dark .navbar-menu {
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-dark .navbar-menu {
|
||||
=======
|
||||
.hero.is-dark .nav {
|
||||
box-shadow: 0 1px 0 rgba(245, 245, 245, 0.2);
|
||||
}
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
.hero.is-dark .nav-menu {
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
background-color: #363636;
|
||||
}
|
||||
}
|
||||
@ -8842,6 +8882,7 @@ label.panel-block:hover {
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
@media screen and (max-width: 1023px) {
|
||||
@ -8858,6 +8899,18 @@ label.panel-block:hover {
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-primary .navbar-menu {
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-primary .navbar-menu {
|
||||
=======
|
||||
.hero.is-primary .nav {
|
||||
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
|
||||
}
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
.hero.is-primary .nav-menu {
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
background-color: #00d1b2;
|
||||
}
|
||||
}
|
||||
@ -8956,8 +9009,17 @@ label.panel-block:hover {
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-link .navbar-menu {
|
||||
=======
|
||||
.hero.is-link .nav {
|
||||
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
|
||||
}
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
.hero.is-link .nav-menu {
|
||||
>>>>>>> Update expo
|
||||
background-color: #3273dc;
|
||||
}
|
||||
}
|
||||
@ -9034,6 +9096,7 @@ label.panel-block:hover {
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
@media screen and (max-width: 1023px) {
|
||||
@ -9053,6 +9116,18 @@ label.panel-block:hover {
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-info .navbar-menu {
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-info .navbar-menu {
|
||||
=======
|
||||
.hero.is-info .nav {
|
||||
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
|
||||
}
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
.hero.is-info .nav-menu {
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
background-color: #209cee;
|
||||
>>>>>>> Add link color
|
||||
}
|
||||
@ -9146,6 +9221,9 @@ label.panel-block:hover {
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-success .navbar-menu {
|
||||
=======
|
||||
@ -9155,11 +9233,15 @@ label.panel-block:hover {
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
.hero.is-success .nav-menu {
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-success .navbar-menu {
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
background-color: #23d160;
|
||||
}
|
||||
}
|
||||
@ -9236,6 +9318,7 @@ label.panel-block:hover {
|
||||
color: rgba(0, 0, 0, 0.7);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
@media screen and (max-width: 1023px) {
|
||||
@ -9252,6 +9335,18 @@ label.panel-block:hover {
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-warning .navbar-menu {
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-warning .navbar-menu {
|
||||
=======
|
||||
.hero.is-warning .nav {
|
||||
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
.hero.is-warning .nav-menu {
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
background-color: #ffdd57;
|
||||
}
|
||||
}
|
||||
@ -9330,6 +9425,9 @@ label.panel-block:hover {
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-danger .navbar-menu {
|
||||
=======
|
||||
@ -9339,11 +9437,15 @@ label.panel-block:hover {
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
.hero.is-danger .nav-menu {
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-danger .navbar-menu {
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
background-color: #ff3860;
|
||||
}
|
||||
}
|
||||
@ -10626,6 +10728,7 @@ html.route-index #carbon {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
-webkit-box-align: stretch;
|
||||
-ms-flex-align: stretch;
|
||||
@ -10655,13 +10758,31 @@ html.route-index #carbon {
|
||||
display: -ms-flexbox;
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
align-items: stretch;
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Add love data
|
||||
=======
|
||||
border-radius: 5px;
|
||||
border-top-left-radius: 0;
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Improve snippet
|
||||
=======
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
-webkit-box-align: stretch;
|
||||
-ms-flex-align: stretch;
|
||||
align-items: stretch;
|
||||
border-radius: 5px;
|
||||
border-top-left-radius: 0;
|
||||
display: -webkit-box;
|
||||
display: -ms-flexbox;
|
||||
=======
|
||||
align-items: stretch;
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
}
|
||||
@ -10676,6 +10797,7 @@ html.route-index #carbon {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
-webkit-box-align: stretch;
|
||||
-ms-flex-align: stretch;
|
||||
@ -10705,11 +10827,28 @@ html.route-index #carbon {
|
||||
display: -ms-flexbox;
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
align-items: stretch;
|
||||
>>>>>>> Add love data
|
||||
=======
|
||||
border-radius: 0 5px 5px 0;
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Improve snippet
|
||||
=======
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
-webkit-box-align: stretch;
|
||||
-ms-flex-align: stretch;
|
||||
align-items: stretch;
|
||||
border-radius: 0 5px 5px 0;
|
||||
display: -webkit-box;
|
||||
display: -ms-flexbox;
|
||||
=======
|
||||
align-items: stretch;
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
@ -11257,6 +11396,12 @@ html.route-index .hero.is-primary a.column:hover .title strong {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
align-items: center;
|
||||
display: none;
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
<<<<<<< HEAD
|
||||
-webkit-box-align: center;
|
||||
-ms-flex-align: center;
|
||||
@ -11265,6 +11410,7 @@ html.route-index .hero.is-primary a.column:hover .title strong {
|
||||
display: -ms-flexbox;
|
||||
display: flex;
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
align-items: center;
|
||||
=======
|
||||
-webkit-box-align: center;
|
||||
@ -11280,10 +11426,17 @@ html.route-index .hero.is-primary a.column:hover .title strong {
|
||||
align-items: center;
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
align-items: center;
|
||||
>>>>>>> Add love data
|
||||
display: none;
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
margin-top: 8.4px;
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user