BunsenLabs / bunsen-conky

Interesting scripts and setups for Conky
https://pkg.bunsenlabs.org/debian/pool/main/b/bunsen-conky/
GNU General Public License v3.0
40 stars 11 forks source link

Conky top margins needed. #8

Closed johnraff closed 9 years ago

johnraff commented 9 years ago

All the conkys available from the conky-chooser menu are too close to the top edge of the screen, so they overlap with tint2. http://postimg.org/image/mflrksnb9/ I found gap_y 45 perhaps more in balance with the right margin? http://postimg.org/image/giifsoxkj/

Sector11 commented 9 years ago

Will fix that now and upload

Sector11 commented 9 years ago

Done - I think ... this is what happened here:

 14 May 15 | 12:29:51 ~
    $ cd /media/5/GitHub_BunsenLab/bunsen-conky

 14 May 15 | 12:30:01 /media/5/GitHub_BunsenLab/bunsen-conky
    $ git status
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#   modified:   conky/BL-Default.conkyrc
#   modified:   conky/BL-Left.conkyrc
#   modified:   conky/BL-Right-lua.conkyrc
#   modified:   conky/BL-Top.conkyrc
#   modified:   conky/CB-Left.conkyrc
#   modified:   conky/CB-Right.conkyrc
#   modified:   conky/Classic.conkyrc
#   modified:   conky/conkyrc_cb
#
no changes added to commit (use "git add" and/or "git commit -a")

 14 May 15 | 12:30:07 /media/5/GitHub_BunsenLab/bunsen-conky
    $ git add --all

 14 May 15 | 12:30:20 /media/5/GitHub_BunsenLab/bunsen-conky
    $ git commit
[master e273fdb] Tweaked spacing on all conkys.
 8 files changed, 8 insertions(+), 8 deletions(-)

 14 May 15 | 12:30:54 /media/5/GitHub_BunsenLab/bunsen-conky
    $ git push
Username for 'https://github.com': sector11
Password for 'https://sector11@github.com': 
To https://github.com/BunsenLabs/bunsen-conky.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/BunsenLabs/bunsen-conky.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

 14 May 15 | 12:31:34 /media/5/GitHub_BunsenLab/bunsen-conky
    $ git pull
remote: Counting objects: 14, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 14 (delta 0), reused 0 (delta 0), pack-reused 12
Unpacking objects: 100% (14/14), done.
From https://github.com/BunsenLabs/bunsen-conky
   190f334..f4a0836  master     -> origin/master
Removing conky/README
Auto-merging README
Merge made by the 'recursive' strategy.
 README.md => README         |   55 +++++++++++--------------------------------------------
 conky/README                |   64 ----------------------------------------------------------------
 debian/bunsen-conky.install |    1 +
 debian/changelog            |    5 +++++
 debian/compat               |    1 +
 debian/control              |   16 ++++++++++++++++
 debian/copyright            |   30 ++++++++++++++++++++++++++++++
 debian/docs                 |    1 +
 debian/rules                |   32 ++++++++++++++++++++++++++++++++
 debian/source/format        |    1 +
 10 files changed, 98 insertions(+), 108 deletions(-)
 rename README.md => README (53%)
 delete mode 100644 conky/README
 create mode 100644 debian/bunsen-conky.install
 create mode 100644 debian/changelog
 create mode 100644 debian/compat
 create mode 100644 debian/control
 create mode 100644 debian/copyright
 create mode 100644 debian/docs
 create mode 100755 debian/rules
 create mode 100644 debian/source/format

 14 May 15 | 12:32:41 /media/5/GitHub_BunsenLab/bunsen-conky
    $ git push
Counting objects: 26, done.
Delta compression using up to 3 threads.
Compressing objects: 100% (14/14), done.
Writing objects: 100% (14/14), 1.24 KiB, done.
Total 14 (delta 11), reused 0 (delta 0)
To https://github.com/BunsenLabs/bunsen-conky.git
   f4a0836..42e63db  master -> master

 14 May 15 | 12:32:59 /media/5/GitHub_BunsenLab/bunsen-conky
    $ git status
# On branch master
nothing to commit (working directory clean)

 14 May 15 | 12:34:37 /media/5/GitHub_BunsenLab/bunsen-conky
    $ 

Xing fingers ... I remember when conky was easy. :+1:

Sector11 commented 9 years ago

But they all look good

johnraff commented 9 years ago

OK I'll push the version number so it gets upgraded.