2024-09-16 14:06:41
This commit is contained in:
parent
b23e374320
commit
09553fc179
30
.obsidian/plugins/obsidian-icon-folder/data.json
vendored
30
.obsidian/plugins/obsidian-icon-folder/data.json
vendored
@ -1,30 +0,0 @@
|
||||
{
|
||||
"settings": {
|
||||
"migrated": 2,
|
||||
"iconPacksPath": ".obsidian/plugins/obsidian-icon-folder/icons",
|
||||
"fontSize": 16,
|
||||
"emojiStyle": "none",
|
||||
"iconColor": null,
|
||||
"recentlyUsedIcons": [
|
||||
"IbGraphLineUp",
|
||||
"TiPlusEqual",
|
||||
"FarRegular",
|
||||
"LiNetwork",
|
||||
"SiC"
|
||||
],
|
||||
"recentlyUsedIconsSize": 5,
|
||||
"rules": [],
|
||||
"extraMargin": {
|
||||
"top": 0,
|
||||
"right": 4,
|
||||
"bottom": 0,
|
||||
"left": 0
|
||||
},
|
||||
"iconInTabsEnabled": false
|
||||
},
|
||||
"Semester 1/CS3418": "SiC",
|
||||
"Semester 1/CS2418": "TiNetwork",
|
||||
"Semester 2/CS2333": "TiPlusEqual",
|
||||
"Semester 2/CS3873": "LiNetwork",
|
||||
"Semester 2/STAT2593": "IbGraphLineUp"
|
||||
}
|
||||
Binary file not shown.
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 142 KiB |
Binary file not shown.
@ -1 +0,0 @@
|
||||
<svg width="16px" height="16px" fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M3 3v14c0 1.886 0 2.828.586 3.414C4.172 21 5.114 21 7 21h14M6.5 17l.498-1.329c.29-.77.434-1.155.653-1.328a1 1 0 0 1 1.021-.13c.256.113.492.45.964 1.124.528.754.792 1.131 1.064 1.243a1 1 0 0 0 1.056-.19c.216-.2.332-.645.564-1.535l1.244-4.768c.264-1.01.396-1.516.633-1.72a1 1 0 0 1 1.083-.144c.282.135.54.589 1.06 1.495.595 1.043.893 1.564 1.192 1.697a1 1 0 0 0 1.116-.209c.23-.232.32-.826.498-2.013L20 3.5" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path></svg>
|
||||
|
Before Width: | Height: | Size: 613 B |
Binary file not shown.
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="16px" height="16px" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="2" width="6" height="6"></rect><rect x="16" y="16" width="6" height="6"></rect><rect x="2" y="16" width="6" height="6"></rect><path d="M5 16v-4h14v4"></path><path d="M12 12V8"></path></svg>
|
||||
|
Before Width: | Height: | Size: 389 B |
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="currentColor" width="16px" height="16px"><title>C</title><path d="M16.5921 9.1962s-.354-3.298-3.627-3.39c-3.2741-.09-4.9552 2.474-4.9552 6.14 0 3.6651 1.858 6.5972 5.0451 6.5972 3.184 0 3.5381-3.665 3.5381-3.665l6.1041.365s.36 3.31-2.196 5.836c-2.552 2.5241-5.6901 2.9371-7.8762 2.9201-2.19-.017-5.2261.034-8.1602-2.97-2.938-3.0101-3.436-5.9302-3.436-8.8002 0-2.8701.556-6.6702 4.047-9.5502C7.444.72 9.849 0 12.254 0c10.0422 0 10.7172 9.2602 10.7172 9.2602z"></path></svg>
|
||||
|
Before Width: | Height: | Size: 549 B |
Binary file not shown.
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-network" width="16px" height="16px" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M12 9m-6 0a6 6 0 1 0 12 0a6 6 0 1 0 -12 0"></path><path d="M12 3c1.333 .333 2 2.333 2 6s-.667 5.667 -2 6"></path><path d="M12 3c-1.333 .333 -2 2.333 -2 6s.667 5.667 2 6"></path><path d="M6 9h12"></path><path d="M3 19h7"></path><path d="M14 19h7"></path><path d="M12 19m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0"></path><path d="M12 15v2"></path></svg>
|
||||
|
Before Width: | Height: | Size: 639 B |
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-plus-equal" width="16px" height="16px" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M4 7h6"></path><path d="M7 4v6"></path><path d="M20 16h-6"></path><path d="M20 19h-6"></path><path d="M5 19l14 -14"></path></svg>
|
||||
|
Before Width: | Height: | Size: 428 B |
4861
.obsidian/plugins/obsidian-icon-folder/main.js
vendored
4861
.obsidian/plugins/obsidian-icon-folder/main.js
vendored
File diff suppressed because one or more lines are too long
@ -1,10 +0,0 @@
|
||||
{
|
||||
"id": "obsidian-icon-folder",
|
||||
"name": "Icon Folder",
|
||||
"version": "2.2.1",
|
||||
"minAppVersion": "0.9.12",
|
||||
"description": "This plugin allows to add an emoji or an icon to a folder or file.",
|
||||
"author": "Florian Woelki",
|
||||
"authorUrl": "https://florianwoelki.com/",
|
||||
"isDesktopOnly": false
|
||||
}
|
||||
111
.obsidian/plugins/obsidian-icon-folder/styles.css
vendored
111
.obsidian/plugins/obsidian-icon-folder/styles.css
vendored
@ -1,111 +0,0 @@
|
||||
.obsidian-icon-folder-icon {
|
||||
border: 1px solid transparent;
|
||||
margin: 0px 4px 0px 0px;
|
||||
display: flex;
|
||||
align-self: center;
|
||||
margin: auto 0;
|
||||
}
|
||||
|
||||
.nav-folder-title,
|
||||
.nav-file-title {
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.obsidian-icon-folder-setting .setting-item-control .dropdown {
|
||||
margin-right: 12px;
|
||||
}
|
||||
|
||||
.obsidian-icon-folder-setting input[type='color'] {
|
||||
margin: 0 6px;
|
||||
}
|
||||
|
||||
.obsidian-icon-folder-modal.prompt-results {
|
||||
margin: 0;
|
||||
overflow-y: auto;
|
||||
display: grid;
|
||||
grid-template-columns: repeat(5, minmax(0, 1fr));
|
||||
}
|
||||
|
||||
.prompt .obsidian-icon-folder-subheadline {
|
||||
margin-top: 12px;
|
||||
font-size: 12px;
|
||||
color: gray;
|
||||
grid-column-start: 1;
|
||||
grid-column-end: 6;
|
||||
}
|
||||
|
||||
@media (max-width: 640px) {
|
||||
.obsidian-icon-folder-modal.prompt-results {
|
||||
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||
}
|
||||
.prompt .obsidian-icon-folder-subheadline {
|
||||
grid-column-end: 4;
|
||||
}
|
||||
}
|
||||
|
||||
.obsidian-icon-folder-modal.prompt-results .suggestion-item {
|
||||
cursor: pointer;
|
||||
white-space: pre-wrap;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
align-items: center;
|
||||
flex-direction: column-reverse;
|
||||
text-align: center;
|
||||
font-size: 13px;
|
||||
color: gray;
|
||||
padding: 16px 8px;
|
||||
line-break: auto;
|
||||
word-break: break-word;
|
||||
line-height: 1.3;
|
||||
}
|
||||
|
||||
.obsidian-icon-folder-modal.prompt-results .suggestion-item.suggestion-item__center {
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.obsidian-icon-folder-icon-preview {
|
||||
font-size: 22px;
|
||||
}
|
||||
|
||||
.obsidian-icon-folder-icon-preview img {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
}
|
||||
|
||||
.obsidian-icon-folder-icon-preview svg {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
color: currentColor;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.obsidian-icon-folder-dragover {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.obsidian-icon-folder-dragover-el {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
color: var(--text-normal);
|
||||
background-color: var(--background-secondary-alt);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
/* Custom rule modal. */
|
||||
.obsidian-icon-folder-custom-rule-modal .modal-title h3 {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.obsidian-icon-folder-custom-rule-modal .modal-content {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.obsidian-icon-folder-custom-rule-modal .modal-content input {
|
||||
width: 100%;
|
||||
margin-right: 0.5rem;
|
||||
}
|
||||
@ -142,4 +142,20 @@ Their goals:
|
||||
### Communism in China
|
||||
- Long complex power struggle between Chinese Communist (CCP), led by Mao Zedong, and Chinese Nationalists, led by Chiang Kai-shek
|
||||
- Civil War (1946-49): Communists win control of the mainland, establish Peoples' Republic (PRC) in 1949
|
||||
- Mao and Stalin sign treaty of alliance in 1950, but China is "junior partner" in Soviet opinion; the two countries eventually become rivals
|
||||
- Mao and Stalin sign treaty of alliance in 1950, but China is "junior partner" in Soviet opinion; the two countries eventually become rivals
|
||||
### War in Korea
|
||||
- Korea split into two zones (US and Soviet); evolve along different paths
|
||||
- Kim Il-Sung, Communist leader of Norther Korea, orders invasion of South in 1950 (had consulted Mao and Stalin)
|
||||
- US-led forces repel invasion, then invade North Korea; China sends troops, heavy fighting; armistice signed in 1953, after Stalin's Death
|
||||
## A change in leadership
|
||||
### The Rise of Nikita Khrushchev
|
||||
- Gradually emerges as dominant leader after Stalin's death, 1953-1956; reduces repression, seeks reform
|
||||
- Speaks of "peaceful coexistence", but a true believer in promoting Communism, competing with USA
|
||||
- Wants to improve living standards, but also invests heavily in space race; seeks to exert pressure on USA
|
||||
- Age of decolonization, states achieving independence in Asia, Africa: Khrushchev sees opportunity
|
||||
### The Soviet Union engages the "Third World"
|
||||
- Seeking to win friendship, influence in newly independent states; Khrushchev conducts visits
|
||||
- Soviets provide material aid, weaponry, other support - role of Komsomol and other organizations
|
||||
- Foreign students encouraged to study in USSR
|
||||
- Competing with USA for global influence
|
||||
- Mao's PRC also emerges as rival/competitor
|
||||
|
||||
Loading…
Reference in New Issue
Block a user