scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 05:02:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5410 from rekonder/fix_conflicts

Browse source 
Resolve conflicts after navigator merge
This commit is contained in:
artoscinote 2023-05-16 10:59:44 +02:00 committed by GitHub
commit fc6f443b1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/repositories.scss
View file

@ -7,10 +7,7 @@
.repository-show { .repository-show {
height: calc(100vh - var(--navbar-height)); height: calc(100vh - var(--navbar-height));
<<<<<<< HEAD
left: var(--left-navigation-width); left: var(--left-navigation-width);
=======
>>>>>>> develop
margin: 0; margin: 0;
padding: 0 2em; padding: 0 2em;
position: absolute; position: absolute;
@ -37,10 +34,7 @@
background-color: $color-white; background-color: $color-white;
border: 0; border: 0;
display: flex; display: flex;
<<<<<<< HEAD
left: var(--left-navigation-width); left: var(--left-navigation-width);
=======
>>>>>>> develop
margin-left: 0em; margin-left: 0em;
padding: 0 2em; padding: 0 2em;
position: fixed; position: fixed;
@ -164,10 +158,7 @@
bottom: 0; bottom: 0;
display: flex; display: flex;
height: 5em; height: 5em;
<<<<<<< HEAD
left: var(--left-navigation-width); left: var(--left-navigation-width);
=======
>>>>>>> develop
padding: 0 2em; padding: 0 2em;
position: fixed; position: fixed;
transition: .4s $timing-function-sharp; transition: .4s $timing-function-sharp;

3
app/assets/stylesheets/repository/repository_toolbar.scss
View file

@ -9,10 +9,7 @@
flex-grow: 1; flex-grow: 1;
flex-wrap: nowrap; flex-wrap: nowrap;
height: 6em; height: 6em;
<<<<<<< HEAD
left: var(--left-navigation-width); left: var(--left-navigation-width);
=======
>>>>>>> develop
padding: 1em 2em 0; padding: 1em 2em 0;
position: fixed; position: fixed;
top: calc(4em + var(--navbar-height)); top: calc(4em + var(--navbar-height));