mirror of
https://github.com/jgthms/bulma.git
synced 2024-11-14 11:14:24 +00:00
Update expo
This commit is contained in:
Jeremy Thomas
parent
d8547648ea
commit
1feca89827
@ -8973,6 +8973,7 @@ label.panel-block:hover {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
=======
|
||||
@ -8981,6 +8982,8 @@ label.panel-block:hover {
|
||||
>>>>>>> Add love data
|
||||
=======
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
=======
|
||||
box-shadow: 0 1px 0 rgba(219, 219, 219, 0.3);
|
||||
>>>>>>> Use link instead of primary
|
||||
@ -9011,6 +9014,7 @@ label.panel-block:hover {
|
||||
box-shadow: 0 1px 0 rgba(219, 219, 219, 0.3);
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
=======
|
||||
=======
|
||||
@ -9040,6 +9044,8 @@ label.panel-block:hover {
|
||||
=======
|
||||
>>>>>>> Add show code
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
}
|
||||
|
||||
.hero .tabs ul {
|
||||
@ -9075,6 +9081,7 @@ label.panel-block:hover {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
@media screen and (max-width: 1023px) {
|
||||
@ -9101,6 +9108,10 @@ label.panel-block:hover {
|
||||
=======
|
||||
=======
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-white .navbar-menu {
|
||||
=======
|
||||
@ -9110,6 +9121,7 @@ label.panel-block:hover {
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
.hero.is-white .nav-menu {
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Use link instead of primary
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Use link instead of primary
|
||||
@ -9118,7 +9130,13 @@ label.panel-block:hover {
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-white .navbar-menu {
|
||||
>>>>>>> Add show code
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
background-color: white;
|
||||
}
|
||||
}
|
||||
@ -9201,12 +9219,17 @@ label.panel-block:hover {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
=======
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-black .navbar-menu {
|
||||
=======
|
||||
@ -9218,6 +9241,7 @@ label.panel-block:hover {
|
||||
.hero.is-black .nav-menu {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
@ -9231,11 +9255,16 @@ label.panel-block:hover {
|
||||
.hero.is-black .navbar-menu {
|
||||
=======
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> 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;
|
||||
}
|
||||
}
|
||||
@ -9318,6 +9347,9 @@ label.panel-block:hover {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
@media screen and (max-width: 1023px) {
|
||||
@ -9338,6 +9370,7 @@ label.panel-block:hover {
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-light .navbar-menu {
|
||||
@ -9362,6 +9395,8 @@ label.panel-block:hover {
|
||||
.hero.is-light .navbar-menu {
|
||||
>>>>>>> Add show code
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
background-color: whitesmoke;
|
||||
}
|
||||
}
|
||||
@ -9444,6 +9479,9 @@ label.panel-block:hover {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-dark .navbar-menu {
|
||||
=======
|
||||
@ -9470,6 +9508,7 @@ label.panel-block:hover {
|
||||
.hero.is-dark .nav-menu {
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-dark .navbar-menu {
|
||||
@ -9494,6 +9533,8 @@ label.panel-block:hover {
|
||||
.hero.is-dark .navbar-menu {
|
||||
>>>>>>> Add show code
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
background-color: #363636;
|
||||
}
|
||||
}
|
||||
@ -9576,8 +9617,11 @@ label.panel-block:hover {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-primary .navbar-menu {
|
||||
=======
|
||||
@ -9593,6 +9637,9 @@ label.panel-block:hover {
|
||||
.hero.is-primary .navbar-menu {
|
||||
>>>>>>> Add show code
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-primary .navbar-menu {
|
||||
@ -9605,6 +9652,7 @@ label.panel-block:hover {
|
||||
.hero.is-primary .nav-menu {
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-primary .navbar-menu {
|
||||
@ -9622,6 +9670,8 @@ label.panel-block:hover {
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
background-color: #00d1b2;
|
||||
}
|
||||
}
|
||||
@ -9761,6 +9811,7 @@ label.panel-block:hover {
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
@media screen and (max-width: 1023px) {
|
||||
@ -9804,6 +9855,18 @@ label.panel-block:hover {
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-link .navbar-menu {
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
@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
|
||||
>>>>>>> Update expo
|
||||
background-color: #3273dc;
|
||||
}
|
||||
}
|
||||
@ -9927,6 +9990,7 @@ label.panel-block:hover {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-info .navbar-menu {
|
||||
=======
|
||||
@ -9965,6 +10029,8 @@ label.panel-block:hover {
|
||||
=======
|
||||
=======
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-info .navbar-menu {
|
||||
<<<<<<< HEAD
|
||||
@ -9991,6 +10057,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
|
||||
>>>>>>> Add link color
|
||||
@ -10126,10 +10204,15 @@ label.panel-block:hover {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
=======
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-success .navbar-menu {
|
||||
=======
|
||||
@ -10140,6 +10223,7 @@ label.panel-block:hover {
|
||||
@media screen and (max-width: 768px) {
|
||||
.hero.is-success .nav-menu {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
@ -10162,11 +10246,16 @@ label.panel-block:hover {
|
||||
@media screen and (max-width: 768px) {
|
||||
.hero.is-success .nav-menu {
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> 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;
|
||||
}
|
||||
}
|
||||
@ -10249,8 +10338,11 @@ label.panel-block:hover {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-warning .navbar-menu {
|
||||
=======
|
||||
@ -10266,6 +10358,9 @@ label.panel-block:hover {
|
||||
.hero.is-warning .navbar-menu {
|
||||
>>>>>>> Add show code
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-warning .navbar-menu {
|
||||
@ -10278,6 +10373,7 @@ label.panel-block:hover {
|
||||
.hero.is-warning .nav-menu {
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-warning .navbar-menu {
|
||||
@ -10295,6 +10391,8 @@ label.panel-block:hover {
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
background-color: #ffdd57;
|
||||
}
|
||||
}
|
||||
@ -10377,12 +10475,17 @@ label.panel-block:hover {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
=======
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
>>>>>>> Add show code
|
||||
=======
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
@media screen and (max-width: 1023px) {
|
||||
.hero.is-danger .navbar-menu {
|
||||
=======
|
||||
@ -10394,6 +10497,7 @@ label.panel-block:hover {
|
||||
.hero.is-danger .nav-menu {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
@media screen and (max-width: 1023px) {
|
||||
@ -10407,11 +10511,16 @@ label.panel-block:hover {
|
||||
.hero.is-danger .navbar-menu {
|
||||
=======
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> 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;
|
||||
}
|
||||
}
|
||||
@ -11719,6 +11828,7 @@ html.route-index #carbon {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
-webkit-box-align: stretch;
|
||||
-ms-flex-align: stretch;
|
||||
@ -11794,6 +11904,8 @@ html.route-index #carbon {
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
>>>>>>> Add love data
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
align-items: stretch;
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
@ -11822,6 +11934,8 @@ html.route-index #carbon {
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
>>>>>>> Add love data
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
-webkit-box-align: stretch;
|
||||
-ms-flex-align: stretch;
|
||||
align-items: stretch;
|
||||
@ -11865,6 +11979,8 @@ html.route-index #carbon {
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
=======
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
align-items: stretch;
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Add love data
|
||||
@ -11874,8 +11990,27 @@ html.route-index #carbon {
|
||||
=======
|
||||
border-radius: 5px;
|
||||
border-top-left-radius: 0;
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Improve snippet
|
||||
<<<<<<< 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
|
||||
>>>>>>> Update expo
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
}
|
||||
@ -11899,6 +12034,7 @@ html.route-index #carbon {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
-webkit-box-align: stretch;
|
||||
-ms-flex-align: stretch;
|
||||
@ -11967,6 +12103,8 @@ html.route-index #carbon {
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
>>>>>>> Add love data
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
align-items: stretch;
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
@ -11996,6 +12134,8 @@ html.route-index #carbon {
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
>>>>>>> Add love data
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
-webkit-box-align: stretch;
|
||||
-ms-flex-align: stretch;
|
||||
align-items: stretch;
|
||||
@ -12054,6 +12194,8 @@ html.route-index #carbon {
|
||||
=======
|
||||
=======
|
||||
=======
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
align-items: stretch;
|
||||
>>>>>>> Add love data
|
||||
<<<<<<< HEAD
|
||||
@ -12064,9 +12206,30 @@ html.route-index #carbon {
|
||||
=======
|
||||
=======
|
||||
border-radius: 0 5px 5px 0;
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Improve snippet
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Improve snippet
|
||||
<<<<<<< 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
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> Update expo
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
@ -12769,6 +12932,7 @@ html.route-index .hero.is-primary a.column:hover .title strong {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
=======
|
||||
>>>>>>> Use link instead of primary
|
||||
@ -12792,6 +12956,8 @@ html.route-index .hero.is-primary a.column:hover .title strong {
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
>>>>>>> Add love data
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
align-items: center;
|
||||
display: none;
|
||||
=======
|
||||
@ -12808,6 +12974,14 @@ html.route-index .hero.is-primary a.column:hover .title strong {
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
>>>>>>> Add love data
|
||||
=======
|
||||
=======
|
||||
align-items: center;
|
||||
display: none;
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Update expo
|
||||
-webkit-box-align: center;
|
||||
-ms-flex-align: center;
|
||||
align-items: center;
|
||||
@ -12872,6 +13046,7 @@ html.route-index .hero.is-primary a.column:hover .title strong {
|
||||
>>>>>>> Add love data
|
||||
=======
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
align-items: center;
|
||||
=======
|
||||
-webkit-box-align: center;
|
||||
@ -12887,11 +13062,21 @@ 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
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Use link instead of primary
|
||||
=======
|
||||
=======
|
||||
>>>>>>> Update expo
|
||||
>>>>>>> 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