Skip to content

Master #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vasil-sokolov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Master #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions web/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ body {
font-size: var(--vscode-font-size);
font-weight: var(--vscode-font-weight);
font-family: var(--vscode-font-family);
background-color: #161616;
background-color: var(--vscode-editor-background);

&.vscode-light, &.vscode-high-contrast-light {
background-color: var(--vscode-editor-background);
Expand Down Expand Up @@ -190,6 +190,7 @@ button
color var(--vscode-button-foreground)
background var(--vscode-button-background)
border 1px solid var(--vscode-button-background)
border-radius: 3px
// box-shadow 1px 1px 2px 1px #bbb
&:enabled
&:hover
Expand Down Expand Up @@ -226,25 +227,36 @@ details > summary
white-space nowrap

input:not([type='checkbox']):not([type='radio']).filter
font-family monospace
padding 0 0 0 5px
font-size var(--vscode-font-size)
font-weight var(--vscode-font-weight)
font-family var(--vscode-font-family)
padding 3px 0 5px 5px
background black
color #d5983d
border-radius 5px
border 1px solid var(--vscode-input-border)

ul.context-menu-wrapper
position absolute
background #111111dd
z-index 10
min-width 150px
cursor pointer
box-shadow 0 2px 3px 2px #111111dd
//background #333
//box-shadow 0 2px 3px 2px #111111dd
user-select none
z-index 10
border-radius: 3px
overflow hidden
background-color: var(--vscode-menu-background);
box-shadow: 0 1px 4px 1px var(--vscode-widget-shadow);
color: var(--vscode-menu-foreground);
> li
padding 4px 8px
&:not(:last-child)
border-bottom 1px solid #424242
margin 4px
border-radius 4px
//&:not(:last-child)
// border-bottom 1px solid #424242
&:hover
background black
background-color: var(--vscode-menu-selectionBackground, var(--vscode-menu-background))
color: var(--vscode-menu-selectionForeground, var(--vscode-menu-foreground))
</style>

<style lang="stylus" scoped>
Expand Down
13 changes: 10 additions & 3 deletions web/src/components/Popup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,25 @@ export default
right 0
z-index 9999
box-sizing border-box
background rgba(0,0,0,0.9)
.modal-background
position absolute
background rgba(0,0,0,0.6)
.modal-main
max-height 98vh
max-width 98vw
min-width 50px
position relative
box-sizing border-box
overflow auto
resize both
background #80808020
//resize both
//background #333
//background var(--vscode-editorPane-background)
//background var(--vscode-dropdown-background)
background var(--vscode-editorWidget-background)
border 1px solid var(--vscode-editorWidget-border)
//--vscode-dropdown-listBackground
border-radius 5px
box-shadow: 0 0 5px solid #000
.titlebar, .close
line-height 2em
margin-top 1vmax
Expand Down
5 changes: 4 additions & 1 deletion web/src/views/CommitRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
.subject-wrapper.flex-1.row.align-center
.vis-ascii-circle.vis-resize-handle :style="commit.branch? {color:commit.branch.color} : undefined" @mousedown="vis_resize_handle_mousedown"
| ●&nbsp;
.refs.row.align-center style="refs_elems.style"
ref-tip v-for="ref of commit.refs" :git_ref="ref" :commit="commit" :key="ref.id"
.subject {{ commit.subject }}
.author.flex-noshrink.align-center :title="commit.author_name+' <'+commit.author_email+'>'"
| {{ commit.author_name }}
Expand All @@ -27,7 +29,7 @@ import SVGVisualization from './SVGVisualization.vue'
###* @typedef {import('./log-utils').Commit} Commit ###

export default
components: { SVGVisualization }
components: { SVGVisualization, RefTip }
props:
commit:
required: true
Expand Down Expand Up @@ -67,6 +69,7 @@ export default
<style lang="stylus" scoped>
.commit
user-select none
color: var(--vscode-foreground)
.info
> *
white-space pre
Expand Down
20 changes: 14 additions & 6 deletions web/src/views/MainView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
repo-selection
aside.center.gap-20
section#search.center.gap-5.justify-flex-end aria-roledescription="Search"
input.filter#txt-filter v-model="txt_filter" placeholder="🔍 search subject, hash, author" ref="txt_filter_ref" @keyup.enter="txt_filter_enter($event)" @keyup.f3="txt_filter_enter($event)"
input.filter#txt-filter v-model="txt_filter" placeholder="🔎︎ search subject, hash, author" ref="txt_filter_ref" @keyup.enter="txt_filter_enter($event)" @keyup.f3="txt_filter_enter($event)"
button#regex-filter.center v-if="txt_filter" @click="txt_filter_regex=!txt_filter_regex" :class="{active:txt_filter_regex}"
i.codicon.codicon-regex title="Use Regular Expression (Alt+R)"
button#clear-filter.center v-if="txt_filter" @click="clear_filter()" title="Clear search"
Expand Down Expand Up @@ -89,15 +89,25 @@ details#log-config
border-bottom 1px solid #424242
#repo-selection
overflow hidden
min-width 50x
min-width 50px
flex-shrink 1
> select
color #ccc
padding: 2px 1px
border-radius 6px
background-color var(--vscode-commandCenter-background)
border 1px solid var(--vscode-commandCenter-border)
> aside
flex-shrink 3
> section#search
overflow hidden
input#txt-filter
width 425px
overflow hidden
background-color: var(--vscode-commandCenter-background);
border: 1px solid var(--vscode-commandCenter-border);
border-radius: 6px;
padding: 4px 6px;
#regex-filter, #clear-filter
position relative
width 0
Expand Down Expand Up @@ -136,7 +146,6 @@ details#log-config
> #all-branches, > #history
position absolute
background #161616dd
box-shadow 0 0 5px 2px #161616dd
border-radius 5px
> #all-branches
top 15px
Expand All @@ -160,8 +169,7 @@ details#log-config
.commit
cursor pointer
&.selected_commit
box-shadow 0 0 3px 0px gold
background #292616
background #42403d
:deep(.info)
border-top 1px solid #2e2e2e

Expand All @@ -183,7 +191,7 @@ details#log-config
#selected-commit, #selected-commits
overflow auto
z-index 1
background #161616
background var(--vscode-editor-background)
#close-selected-commit, #close-selected-commits
position absolute
top 10px
Expand Down
2 changes: 1 addition & 1 deletion web/src/views/RefTip.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default defineComponent
color: props.git_ref.color
border:
if is_head
"2px solid #{props.git_ref.color}"
"1px solid #{props.git_ref.color}"
else undefined
class:
head: is_head
Expand Down
20 changes: 10 additions & 10 deletions web/src/views/RefTip.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@

<style lang="stylus" scoped>
.ref-tip
background black
font-weight bold
font-style italic
display inline-block
padding 1px 3px
border 1px solid #505050
border-radius 7px
white-space pre
margin 0 1px
background: #373737;
font-weight: normal;
display: inline-block;
padding: 0px 4px 1px;
border: 1px solid #424141;
border-radius: 4px;
white-space: pre;
margin-right: 3px;
font-size: 11px;
&.head
box-shadow 0px 0px 6px 4px #ffffff30, 0px 0px 4px 0px #ffffff30 inset
//box-shadow 0px 0px 6px 4px #ffffff30, 0px 0px 4px 0px #ffffff30 inset
&:after
content ' (HEAD)'
color white
Expand Down
6 changes: 3 additions & 3 deletions web/src/views/SVGVisualization.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
svg :height="height" :style="style"
path.vis-line v-for="line of lines" v-bind="line"
circle.vis-line v-if="circle" v-bind="circle"
.refs.row.align-center :style="refs_elems.style"
ref-tip v-for="ref of refs_elems.refs" :git_ref="ref" :commit="commit" :key="ref.id"
//.refs.row.align-center :style="refs_elems.style"
// ref-tip v-for="ref of refs_elems.refs" :git_ref="ref" :commit="commit" :key="ref.id"
</template>

<script lang="coffee" src="./SVGVisualization.coffee"></script>
Expand All @@ -21,7 +21,7 @@
// center vertically
transform translateY(-50%)
line-height 1em
opacity 85%
//opacity 85%
z-index 1
svg
> path
Expand Down