other fonts for other resolutions

slipset · Dec 1, 2017 · 19cdaa9 · 19cdaa9
1 parent 01e51fe
commit 19cdaa9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/elisp/slipset-osx.el b/elisp/slipset-osx.el
@@ -14,7 +14,10 @@
 
 (cond ((and (= 2560 (display-pixel-width))
 	    (= 1440 (display-pixel-height)))
-       (set-face-attribute 'default nil :height 110)))
+       (set-face-attribute 'default nil :height 110)
+       (and (= 3440 (display-pixel-width))
+	    (= 1440 (display-pixel-height)))
+       (set-face-attribute 'default nil :height 100)))
 
 
 (provide 'slipset-osx)
diff --git a/projectile-bookmarks.eld b/projectile-bookmarks.eld
@@ -1 +1 @@
-("~/Documents/telenordigital.com/di-gbe-analytics-tool/" "~/.emacs.d/" "c:/Users/G015597/workspace/logstash-forwarder/" "c:/Users/G015597/workspace/clojure/" "c:/Users/G015597/workspace/forhandler-web/" "c:/Users/G015597/workspace/soaptest/" "c:/Users/G015597/workspace/postman-clj/" "c:/Users/G015597/workspace/github.com/moon/" "c:/Users/G015597/workspace/enonic-resources-works/" "c:/Users/G015597/workspace/skademelding-fridtidsbaat/" "c:/Users/G015597/workspace/gje-angular-skademelding-common/" "c:/Users/G015597/workspace/str/" "c:/Users/G015597/workspace/skademelding-motorvogn/" "c:/dev/prog/apache-maven-3.2.2/" "y:/" "c:/Users/G015597/workspace/skademelding-telenor-mobil/" "c:/Users/G015597/workspace/web_ip/" "c:/Users/G015597/workspace/selenium-test/" "c:/Users/G015597/workspace/parselog/" "c:/Users/G015597/workspace/periodisk-oppdatering/" "v:/" "c:/Users/G015597/workspace/gje-angular-samtykke/" "c:/Users/G015597/workspace/gje-angular-prosessguide/" "c:/Users/G015597/workspace/enonic-resources/" "c:/Users/G015597/workspace/skademelding-idrettsskade/" "c:/Users/G015597/workspace/detaljert-risikooversikt/" "c:/Users/G015597/workspace/gje-angular-engasjementsvisning/" "c:/Users/G015597/workspace/gje-angular-dekningsrangering/" "c:/Users/G015597/workspace/orbeon-export/" "c:/Users/G015597/workspace/skademelding-bolig-innbo/" "c:/dev/prog/apache-maven-3.2.2/maven-settings/" "c:/Users/G015597/workspace/tmp/web_ip/" "z:/" "c:/Users/G015597/workspace/enonic-intern-resources/" "c:/Users/G015597/workspace/solguru-slack/")
+("~/Documents/ardoq.com/ardoq-api/" "~/Documents/telenordigital.com/di-gbe-analytics-tool/" "~/.emacs.d/" "c:/Users/G015597/workspace/logstash-forwarder/" "c:/Users/G015597/workspace/clojure/" "c:/Users/G015597/workspace/forhandler-web/" "c:/Users/G015597/workspace/soaptest/" "c:/Users/G015597/workspace/postman-clj/" "c:/Users/G015597/workspace/github.com/moon/" "c:/Users/G015597/workspace/enonic-resources-works/" "c:/Users/G015597/workspace/skademelding-fridtidsbaat/" "c:/Users/G015597/workspace/gje-angular-skademelding-common/" "c:/Users/G015597/workspace/str/" "c:/Users/G015597/workspace/skademelding-motorvogn/" "c:/dev/prog/apache-maven-3.2.2/" "y:/" "c:/Users/G015597/workspace/skademelding-telenor-mobil/" "c:/Users/G015597/workspace/web_ip/" "c:/Users/G015597/workspace/selenium-test/" "c:/Users/G015597/workspace/parselog/" "c:/Users/G015597/workspace/periodisk-oppdatering/" "v:/" "c:/Users/G015597/workspace/gje-angular-samtykke/" "c:/Users/G015597/workspace/gje-angular-prosessguide/" "c:/Users/G015597/workspace/enonic-resources/" "c:/Users/G015597/workspace/skademelding-idrettsskade/" "c:/Users/G015597/workspace/detaljert-risikooversikt/" "c:/Users/G015597/workspace/gje-angular-engasjementsvisning/" "c:/Users/G015597/workspace/gje-angular-dekningsrangering/" "c:/Users/G015597/workspace/orbeon-export/" "c:/Users/G015597/workspace/skademelding-bolig-innbo/" "c:/dev/prog/apache-maven-3.2.2/maven-settings/" "c:/Users/G015597/workspace/tmp/web_ip/" "z:/" "c:/Users/G015597/workspace/enonic-intern-resources/" "c:/Users/G015597/workspace/solguru-slack/")
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		("~/Documents/telenordigital.com/di-gbe-analytics-tool/" "~/.emacs.d/" "c:/Users/G015597/workspace/logstash-forwarder/" "c:/Users/G015597/workspace/clojure/" "c:/Users/G015597/workspace/forhandler-web/" "c:/Users/G015597/workspace/soaptest/" "c:/Users/G015597/workspace/postman-clj/" "c:/Users/G015597/workspace/github.com/moon/" "c:/Users/G015597/workspace/enonic-resources-works/" "c:/Users/G015597/workspace/skademelding-fridtidsbaat/" "c:/Users/G015597/workspace/gje-angular-skademelding-common/" "c:/Users/G015597/workspace/str/" "c:/Users/G015597/workspace/skademelding-motorvogn/" "c:/dev/prog/apache-maven-3.2.2/" "y:/" "c:/Users/G015597/workspace/skademelding-telenor-mobil/" "c:/Users/G015597/workspace/web_ip/" "c:/Users/G015597/workspace/selenium-test/" "c:/Users/G015597/workspace/parselog/" "c:/Users/G015597/workspace/periodisk-oppdatering/" "v:/" "c:/Users/G015597/workspace/gje-angular-samtykke/" "c:/Users/G015597/workspace/gje-angular-prosessguide/" "c:/Users/G015597/workspace/enonic-resources/" "c:/Users/G015597/workspace/skademelding-idrettsskade/" "c:/Users/G015597/workspace/detaljert-risikooversikt/" "c:/Users/G015597/workspace/gje-angular-engasjementsvisning/" "c:/Users/G015597/workspace/gje-angular-dekningsrangering/" "c:/Users/G015597/workspace/orbeon-export/" "c:/Users/G015597/workspace/skademelding-bolig-innbo/" "c:/dev/prog/apache-maven-3.2.2/maven-settings/" "c:/Users/G015597/workspace/tmp/web_ip/" "z:/" "c:/Users/G015597/workspace/enonic-intern-resources/" "c:/Users/G015597/workspace/solguru-slack/")
		("~/Documents/ardoq.com/ardoq-api/" "~/Documents/telenordigital.com/di-gbe-analytics-tool/" "~/.emacs.d/" "c:/Users/G015597/workspace/logstash-forwarder/" "c:/Users/G015597/workspace/clojure/" "c:/Users/G015597/workspace/forhandler-web/" "c:/Users/G015597/workspace/soaptest/" "c:/Users/G015597/workspace/postman-clj/" "c:/Users/G015597/workspace/github.com/moon/" "c:/Users/G015597/workspace/enonic-resources-works/" "c:/Users/G015597/workspace/skademelding-fridtidsbaat/" "c:/Users/G015597/workspace/gje-angular-skademelding-common/" "c:/Users/G015597/workspace/str/" "c:/Users/G015597/workspace/skademelding-motorvogn/" "c:/dev/prog/apache-maven-3.2.2/" "y:/" "c:/Users/G015597/workspace/skademelding-telenor-mobil/" "c:/Users/G015597/workspace/web_ip/" "c:/Users/G015597/workspace/selenium-test/" "c:/Users/G015597/workspace/parselog/" "c:/Users/G015597/workspace/periodisk-oppdatering/" "v:/" "c:/Users/G015597/workspace/gje-angular-samtykke/" "c:/Users/G015597/workspace/gje-angular-prosessguide/" "c:/Users/G015597/workspace/enonic-resources/" "c:/Users/G015597/workspace/skademelding-idrettsskade/" "c:/Users/G015597/workspace/detaljert-risikooversikt/" "c:/Users/G015597/workspace/gje-angular-engasjementsvisning/" "c:/Users/G015597/workspace/gje-angular-dekningsrangering/" "c:/Users/G015597/workspace/orbeon-export/" "c:/Users/G015597/workspace/skademelding-bolig-innbo/" "c:/dev/prog/apache-maven-3.2.2/maven-settings/" "c:/Users/G015597/workspace/tmp/web_ip/" "z:/" "c:/Users/G015597/workspace/enonic-intern-resources/" "c:/Users/G015597/workspace/solguru-slack/")